diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt
index 238b423294f..4908ff2d889 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt
@@ -113,6 +113,8 @@ internal fun LLFirAbstractBodyTargetResolver.transformAnnotations(target: FirEle
             target.transformSingle(transformer, ResolutionMode.ContextIndependent)
         }
 
+        target is FirScript -> {}
+
         else -> throwUnexpectedFirElementError(target)
     }
 }
@@ -124,7 +126,6 @@ internal val FirElementWithResolveState.isRegularDeclarationWithAnnotation: Bool
         is FirDanglingModifierList,
         is FirFileAnnotationsContainer,
         is FirTypeAlias,
-        is FirScript,
         -> true
         else -> false
     }
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
index 33e635bd7f7..c474a60bf0e 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
@@ -142,7 +142,7 @@ private class LLFirBodyTargetResolver(
             is FirField -> resolve(target, BodyStateKeepers.FIELD)
             is FirVariable -> resolve(target, BodyStateKeepers.VARIABLE)
             is FirAnonymousInitializer -> resolve(target, BodyStateKeepers.ANONYMOUS_INITIALIZER)
-            is FirScript -> resolve(target, BodyStateKeepers.SCRIPT)
+            is FirScript,
             is FirDanglingModifierList,
             is FirFileAnnotationsContainer,
             is FirTypeAlias,
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt
index 2dff3bbb362..3d76905f4fe 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt
@@ -104,8 +104,10 @@ private class LLFirCompilerRequiredAnnotationsTargetResolver(
     }
 
     override fun doResolveWithoutLock(target: FirElementWithResolveState): Boolean {
-        if (target !is FirRegularClass && !target.isRegularDeclarationWithAnnotation) {
-            throwUnexpectedFirElementError(target)
+        when {
+            target is FirScript -> return false
+            target is FirRegularClass || target.isRegularDeclarationWithAnnotation -> {}
+            else -> throwUnexpectedFirElementError(target)
         }
 
         requireIsInstance<FirAnnotationContainer>(target)
@@ -295,6 +297,7 @@ private class LLFirCompilerRequiredAnnotationsTargetResolver(
     }
 
     override fun doLazyResolveUnderLock(target: FirElementWithResolveState) {
+        if (target is FirScript) return
         throwUnexpectedFirElementError(target)
     }
 }
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt
index 6774a8ee106..7d3d3ba5714 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt
@@ -173,6 +173,7 @@ private class LLFirStatusTargetResolver(
             is FirRegularClass -> {
                 error("should be resolved in doResolveWithoutLock")
             }
+            is FirScript -> {}
             else -> {
                 target.transformSingle(transformer, data = null)
             }
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt
index 26b07482341..2b097726491 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt
@@ -123,7 +123,8 @@ private class LLFirTypeTargetResolver(
 
                 target.accept(transformer, null)
             }
-            is FirDanglingModifierList, is FirFileAnnotationsContainer, is FirCallableDeclaration, is FirTypeAlias, is FirScript -> {
+            is FirScript -> {}
+            is FirDanglingModifierList, is FirFileAnnotationsContainer, is FirCallableDeclaration, is FirTypeAlias -> {
                 target.accept(transformer, null)
             }
             is FirRegularClass -> {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt
index b4e854bbd13..456ed439829 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt
@@ -1,27 +1,27 @@
 FILE: [ResolvedTo(IMPORTS)] classMemberPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int| {
-                    ^ this@R|/X|.F|/X.x|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int
+                public? [ResolvedTo(RAW_FIR)] get(): Int {
+                    ^ field#
                 }
-                public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                    this@R|/X|.F|/X.x| = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                    field# = value#
                 }
 
-            public final [ResolvedTo(STATUS)] val y: R|kotlin/Int| = Int(42)
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = IntegerLiteral(42)
+                public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-            public final [ResolvedTo(STATUS)] var z: R|kotlin/Int| = Int(15)
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var z: Int = IntegerLiteral(15)
+                public? [ResolvedTo(RAW_FIR)] get(): Int
+                public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt
index 19fb716bc70..481efdbcd9a 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt
@@ -1,18 +1,18 @@
 FILE: [ResolvedTo(IMPORTS)] classScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun x(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun y(): R|kotlin/Int| {
-                ^y Int(10)
+            public? final? [ResolvedTo(RAW_FIR)] fun y(): Int {
+                ^y IntegerLiteral(10)
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt
index 9286d0feb7a..edc2cbe4f46 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt
@@ -1,18 +1,18 @@
 FILE: [ResolvedTo(IMPORTS)] constructorsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] a: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor([ResolvedTo(RAW_FIR)] a: Int): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val a: R|kotlin/Int| = R|<local>/a|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] val a: Int = R|<local>/a|
+                public? [ResolvedTo(RAW_FIR)] get(): Int
 
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
-                this<R|A|>(Int(1))
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
+                this<R|A|>(IntegerLiteral(1))
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt
index 10bfd06e336..ea6b3de4545 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt
@@ -1,44 +1,44 @@
 FILE: [ResolvedTo(IMPORTS)] danglingAnnotationClassLevelScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Foo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|Foo| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() <DANGLING MODIFIER: Top level declaration expected>
+            @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() <DANGLING MODIFIER: Top level declaration expected>
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|Bar| {
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|Bar| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() <DANGLING MODIFIER: Top level declaration expected>
+            @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() <DANGLING MODIFIER: Top level declaration expected>
         }
 
-        public final [ResolvedTo(STATUS)] class Outer : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|Outer| {
+        public? final? [ResolvedTo(RAW_FIR)] class Outer : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|Outer| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class Inner : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] constructor(): R|Outer.Inner| {
+            public? final? [ResolvedTo(RAW_FIR)] class Inner : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] constructor(): R|Outer.Inner| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() <DANGLING MODIFIER: Top level declaration expected>
+                @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() <DANGLING MODIFIER: Top level declaration expected>
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
-                local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] constructor(): R|Outer.Local| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+                local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] constructor(): R|Outer.Local| {
                         super<R|kotlin/Any|>()
                     }
 
-                    @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() <DANGLING MODIFIER: Top level declaration expected>
+                    @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() <DANGLING MODIFIER: Top level declaration expected>
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt
index 752206efd35..297d2d6e0e9 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt
@@ -1,29 +1,29 @@
 FILE: [ResolvedTo(IMPORTS)] declarationsInPropertyInitScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val a: R|kotlin/Unit| = this@R|/A|.R|kotlin/run|<R|A|, R|kotlin/Unit|>(<L> = [ResolvedTo(RAW_FIR)] run@fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=EXACTLY_ONCE>  {
-                local final [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] constructor(): R|A.X| {
+            public? final? [ResolvedTo(RAW_FIR)] val a: <implicit> = run#(<L> = [ResolvedTo(RAW_FIR)] run@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                local final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] constructor(): R|A.X| {
                         super<R|kotlin/Any|>()
                     }
 
                 }
 
-                [ResolvedTo(RAW_FIR)] lval y: R|kotlin/Int| = Int(10)
+                [ResolvedTo(RAW_FIR)] lval y: <implicit> = IntegerLiteral(10)
             }
             )
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Unit|
+                public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
         }
 
-        public final inline [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] R> run([ResolvedTo(RAW_FIR)] block: R|() -> R|): R|R| {
-            ^run R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()
+        public? final? inline [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] R> run([ResolvedTo(RAW_FIR)] block: ( () -> R )): R {
+            ^run block#()
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt
index c5dfd7c1eac..57e4214baee 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt
@@ -1,34 +1,34 @@
 FILE: [ResolvedTo(IMPORTS)] enumClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class A : R|kotlin/Enum<A>| {
-            private [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class A : R|kotlin/Enum<A>| {
+            private [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Enum<A>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] enum entry X: R|A|
-            public final static [ResolvedTo(STATUS)] enum entry Y: R|A|
-            public final static [ResolvedTo(STATUS)] enum entry Z: R|A|
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public final static [ResolvedTo(RAW_FIR)] enum entry X: R|A|
+            public final static [ResolvedTo(RAW_FIR)] enum entry Y: R|A|
+            public final static [ResolvedTo(RAW_FIR)] enum entry Z: R|A|
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-            public final [ResolvedTo(STATUS)] fun bar(): R|kotlin/Int| {
-                ^bar Int(10)
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+                ^bar IntegerLiteral(10)
             }
 
-            public final static [ResolvedTo(STATUS)] fun values(): R|kotlin/Array<A>| {
+            public final static [ResolvedTo(RAW_FIR)] fun values(): R|kotlin/Array<A>| {
             }
 
-            public final static [ResolvedTo(STATUS)] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|A| {
+            public final static [ResolvedTo(RAW_FIR)] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|A| {
             }
 
-            public final static [ResolvedTo(STATUS)] val entries: R|kotlin/enums/EnumEntries<A>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<A>|
+            public final static [ResolvedTo(RAW_FIR)] val entries: R|kotlin/enums/EnumEntries<A>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<A>|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt
index 27bd9085982..e807667c688 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt
@@ -1,46 +1,46 @@
 FILE: [ResolvedTo(IMPORTS)] enumClassWithBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class A : R|kotlin/Enum<A>| {
-            private [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class A : R|kotlin/Enum<A>| {
+            private [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Enum<A>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] enum entry X: R|A| = object : R|A| {
+            public final static [ResolvedTo(RAW_FIR)] enum entry X: R|A| = object : R|A| {
                 private [ResolvedTo(RAW_FIR)] constructor(): R|<anonymous>| {
                     super<R|A|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun localInX(): R|kotlin/Int| {
-                    ^localInX Int(1)
+                public? final? [ResolvedTo(RAW_FIR)] fun localInX(): <implicit> {
+                    ^localInX IntegerLiteral(1)
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] enum entry Y: R|A| = object : R|A| {
+            public final static [ResolvedTo(RAW_FIR)] enum entry Y: R|A| = object : R|A| {
                 private [ResolvedTo(RAW_FIR)] constructor(): R|<anonymous>| {
                     super<R|A|>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] enum entry Z: R|A|
-            public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public final static [ResolvedTo(RAW_FIR)] enum entry Z: R|A|
+            public? open [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public final static [ResolvedTo(STATUS)] fun values(): R|kotlin/Array<A>| {
+            public final static [ResolvedTo(RAW_FIR)] fun values(): R|kotlin/Array<A>| {
             }
 
-            public final static [ResolvedTo(STATUS)] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|A| {
+            public final static [ResolvedTo(RAW_FIR)] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|A| {
             }
 
-            public final static [ResolvedTo(STATUS)] val entries: R|kotlin/enums/EnumEntries<A>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<A>|
+            public final static [ResolvedTo(RAW_FIR)] val entries: R|kotlin/enums/EnumEntries<A>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<A>|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt
index f276aa22fb9..7d592c74ec9 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt
@@ -1,17 +1,17 @@
 FILE: [ResolvedTo(IMPORTS)] initBlockScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
             init {
-                [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = Int(10)
-                local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] constructor(): R|A.B| {
+                [ResolvedTo(RAW_FIR)] lval x: <implicit> = IntegerLiteral(10)
+                local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] constructor(): R|A.B| {
                         super<R|kotlin/Any|>()
                     }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt
index e4c04490677..1830e3e881e 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt
@@ -1,11 +1,11 @@
 FILE: [ResolvedTo(IMPORTS)] localClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun a(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] fun a(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] constructor(): R|X| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -13,14 +13,14 @@ FILE: [ResolvedTo(IMPORTS)] localClassScript.kts
 
         }
 
-        public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|Y| {
+        public? final? [ResolvedTo(RAW_FIR)] class Y : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|Y| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun b(): R|kotlin/Unit| {
-                local final [ResolvedTo(RAW_FIR)] class Z : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] constructor(): R|Y.Z| {
+            public? final? [ResolvedTo(RAW_FIR)] fun b(): R|kotlin/Unit| {
+                local final? [ResolvedTo(RAW_FIR)] class Z : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] constructor(): R|Y.Z| {
                         super<R|kotlin/Any|>()
                     }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt
index 757fef7cdbb..d7ee81cdc91 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt
@@ -1,21 +1,21 @@
 FILE: [ResolvedTo(IMPORTS)] localFunScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun z(): R|kotlin/Unit| {
-                local final [ResolvedTo(RAW_FIR)] fun q(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun z(): R|kotlin/Unit| {
+                local final? [ResolvedTo(RAW_FIR)] fun q(): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt
index 26e582ae59a..32cde986c29 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt
@@ -1,35 +1,35 @@
 FILE: [ResolvedTo(IMPORTS)] localPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lvar x: R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lvar x: Int
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun q(): R|kotlin/Unit| {
-                [ResolvedTo(RAW_FIR)] lval y: R|kotlin/Int| = Int(42)
+            public? final? [ResolvedTo(RAW_FIR)] fun q(): R|kotlin/Unit| {
+                [ResolvedTo(RAW_FIR)] lval y: <implicit> = IntegerLiteral(42)
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] constructor(): R|B.C| {
+            public? final? [ResolvedTo(RAW_FIR)] class C : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] constructor(): R|B.C| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun u(): R|kotlin/Unit| {
-                    [ResolvedTo(RAW_FIR)] lvar z: R|kotlin/Int| = Int(15)
+                public? final? [ResolvedTo(RAW_FIR)] fun u(): R|kotlin/Unit| {
+                    [ResolvedTo(RAW_FIR)] lvar z: Int = IntegerLiteral(15)
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt
index 7b0f5f911c3..5ef88007854 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt
@@ -1,14 +1,14 @@
 FILE: [ResolvedTo(IMPORTS)] memberTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias X = R|kotlin/Int|
+            public? final [ResolvedTo(RAW_FIR)] typealias X = Int
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt
index 815f3fe4f0d..3aa3647057b 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt
@@ -1,23 +1,23 @@
 FILE: [ResolvedTo(IMPORTS)] nestedClassesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] constructor(): R|A.B| {
+            public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] constructor(): R|A.B| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun x(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| {
-                    public [ResolvedTo(STATUS)] constructor(): R|A.B.C| {
+                public? final? [ResolvedTo(RAW_FIR)] class C : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] constructor(): R|A.B.C| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -25,15 +25,15 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassesScript.kts
 
             }
 
-            public final [ResolvedTo(STATUS)] class E : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] constructor(): R|A.E| {
+            public? final? [ResolvedTo(RAW_FIR)] class E : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] constructor(): R|A.E| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] fun y(): R|kotlin/Int| {
-                ^y Int(10)
+            public? final? [ResolvedTo(RAW_FIR)] fun y(): Int {
+                ^y IntegerLiteral(10)
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt
index 4622f960530..e15dbcaefc2 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt
@@ -1,27 +1,27 @@
 FILE: [ResolvedTo(IMPORTS)] propertyAccessorsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/x|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/x| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var y: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int| {
-                    ^ this@R|/X|.F|/X.y|
+            public? final? [ResolvedTo(RAW_FIR)] var y: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] get(): Int {
+                    ^ field#
                 }
-                public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                    this@R|/X|.F|/X.y| = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                    field# = value#
                 }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt
index 0917026cd37..711cfc341c5 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt
@@ -1,48 +1,48 @@
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] get(): String
+                public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt
index 668d946496b..089ae736db1 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt
@@ -1,30 +1,30 @@
 FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor([ResolvedTo(RAW_FIR)] init: ( A.() -> Unit )): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val prop: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val prop: String = String()
+                public? [ResolvedTo(RAW_FIR)] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] object C : R|A| {
-            private [ResolvedTo(STATUS)] constructor(): R|C| {
-                super<R|A|>([ResolvedTo(RAW_FIR)] fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| {
-                        ^foo Q|B|.<Unresolved name: prop>#.R|kotlin/toString|()
+        public? final? [ResolvedTo(RAW_FIR)] object C : A {
+            private [ResolvedTo(RAW_FIR)] constructor(): R|C| {
+                super<A>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+                        ^foo B#.prop#.toString#()
                     }
 
                 }
@@ -33,11 +33,11 @@ FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val f: R|A| = object : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] val f: <implicit> = object : A {
             private [ResolvedTo(RAW_FIR)] constructor(): R|<anonymous>| {
-                super<R|A|>([ResolvedTo(RAW_FIR)] fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/String| {
-                        ^bar Q|B|.<Unresolved name: prop>#.R|kotlin/toString|()
+                super<A>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+                        ^bar B#.prop#.toString#()
                     }
 
                 }
@@ -46,23 +46,23 @@ FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts
 
         }
 
-            public [ResolvedTo(RAW_FIR)] get(): R|A|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(STATUS)] class D : R|A| {
-            public [ResolvedTo(STATUS)] error_constructor(): R|D| {
-                super<R|A|>([ResolvedTo(RAW_FIR)] fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| {
-                        ^foo Q|B|.<Unresolved name: prop>#.R|kotlin/toString|()
+        public? final? [ResolvedTo(RAW_FIR)] class D : A {
+            public? [ResolvedTo(RAW_FIR)] error_constructor(): R|D| {
+                super<A>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+                        ^foo B#.prop#.toString#()
                     }
 
                 }
                 )
             }
 
-            public [ResolvedTo(STATUS)] constructor(): R|D| {
-                super<R|A|>([ResolvedTo(RAW_FIR)] fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun boo(): R|kotlin/String| {
-                        ^boo this@R|special/anonymous|.R|/A.prop|.R|kotlin/String.toString|()
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|D| {
+                super<A>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun boo(): <implicit> {
+                        ^boo prop#.toString#()
                     }
 
                 }
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt
index 05ee90cf1cc..e06355b73c6 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt
@@ -1,9 +1,9 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Int| {
-            ^foo Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): Int {
+            ^foo IntegerLiteral(42)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt
index 1ff96605110..d8df85e28cb 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt
@@ -1,9 +1,9 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithoutTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Int| {
-            ^foo Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+            ^foo IntegerLiteral(42)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt
index 83e5a637e82..47b2e7ceb5b 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt
@@ -1,10 +1,10 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelFunWithTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Int| {
-            <Unresolved name: println>#(String())
-            ^foo Int(10)
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): Int {
+            println#(String())
+            ^foo IntegerLiteral(10)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt
index e48c8c1d0cf..19a22b3fde0 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt
@@ -1,20 +1,20 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/x|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/x| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
-        public final [ResolvedTo(RAW_FIR)] val y: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] var z: R|kotlin/Int| = Int(15)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var z: Int = IntegerLiteral(15)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt
index 35306165fe3..cdea789ab67 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt
@@ -1,9 +1,9 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelUnitFunScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
-            <Unresolved name: println>#(String())
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+            println#(String())
         }
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt
index 5c28ca7c7a3..dadc52b5770 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt
@@ -1,45 +1,45 @@
 FILE: [ResolvedTo(IMPORTS)] withoutNameScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <no name provided>([ResolvedTo(RAW_FIR)] a: R|kotlin/Int| = Int(1)): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <no name provided>([ResolvedTo(RAW_FIR)] a: Int = IntegerLiteral(1)): String {
             ^<no name provided> String(str)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <no name provided>(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <no name provided>(): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val <no name provided>: R|kotlin/Int| = Int(4)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val <no name provided>: Int = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
-        public final [ResolvedTo(RAW_FIR)] var <no name provided>: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(4)
+        public? final? [ResolvedTo(RAW_FIR)] var <no name provided>: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(4)
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
             }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <no name provided>([ResolvedTo(STATUS)] a: R|kotlin/Int| = Int(1)): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <no name provided>([ResolvedTo(RAW_FIR)] a: Int = IntegerLiteral(1)): String {
                 ^<no name provided> String(str)
             }
 
-            public final [ResolvedTo(STATUS)] fun <no name provided>(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <no name provided>(): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] val <no name provided>: R|kotlin/Int| = Int(4)
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] val <no name provided>: Int = IntegerLiteral(4)
+                public? [ResolvedTo(RAW_FIR)] get(): Int
 
-            public final [ResolvedTo(STATUS)] var <no name provided>: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/Boolean| {
+            public? final? [ResolvedTo(RAW_FIR)] var <no name provided>: Boolean
+                public? [ResolvedTo(RAW_FIR)] get(): Boolean {
                     ^ Boolean(true)
                 }
-                public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Boolean|): R|kotlin/Unit| {
+                public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Boolean): R|kotlin/Unit| {
                 }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt
index 87e9d631558..d30e38ae906 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt
@@ -7,22 +7,22 @@ String(y)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentOnStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|)) @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public final? [ResolvedTo(RAW_FIR)] annotation class Annotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Annotation.name] name: String): R|Annotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|<local>/name|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val name: String = R|<local>/name|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = @R|Annotation|[Types](name = String(y)) R|/x|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
\ No newline at end of file
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = @Annotation[Unresolved](String(y)) x#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt
index aa8fe68ef25..b5827afeb57 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt
@@ -7,19 +7,19 @@ String(y)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| {
+        public final? [ResolvedTo(RAW_FIR)] annotation class Annotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Annotation.name] name: String): R|Annotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|<local>/name|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val name: String = R|<local>/name|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] get(): String
 
         }
 
-        @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        @Annotation[Unresolved](String(y)) public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt
index 468ce0d8117..943fc263233 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt
@@ -3,13 +3,13 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|[Types](names = vararg(String()))
+@Suppress[Unresolved](String())
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationCallExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String()) public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt
index f830544c842..f3ae1d10fd6 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt
@@ -3,14 +3,14 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@<ERROR TYPE REF: HIDDEN: kotlin/internal/NoInfer is invisible>[Unresolved]()
+@kotlin.internal.NoInfer[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationOnReturnTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <reified [ResolvedTo(RAW_FIR)] T : R|kotlin/Number|> R|kotlin/String|.collectOfType([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): <ERROR TYPE REF: Symbol not found for Sequence> {
-            ^collectOfType Int(4)
+        public? final? [ResolvedTo(RAW_FIR)] fun <reified [ResolvedTo(RAW_FIR)] T : Number> String.collectOfType([ResolvedTo(RAW_FIR)] i: Int): Sequence<@kotlin.internal.NoInfer[Unresolved]() T> {
+            ^collectOfType IntegerLiteral(4)
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt
index ae13b96d499..26bc7f61769 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt
@@ -1,18 +1,18 @@
 KT element: KtNameReferenceExpression
-FIR element: FirResolvedNamedReferenceImpl
+FIR element: FirPropertyAccessExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/annotation/AnnotationRetention.SOURCE|
+AnnotationRetention#.SOURCE#
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] retentionValueScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt
index b28e4186860..40feab82f93 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt
@@ -3,16 +3,16 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|[Types](names = vararg(String()))
+@Suppress[Unresolved](String())
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] statementAnnotation.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = @R|kotlin/Suppress|[Types](names = vararg(String())) R|/foo|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
\ No newline at end of file
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = @Suppress[Unresolved](String()) foo#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt
index 0a3bf593e88..6274e3eacc5 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt
@@ -3,31 +3,31 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types]()
+@Anno[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] superCallAnnotationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|@R|Anno|()  A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|@R|Anno|()  A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : @Anno[Unresolved]() A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<@Anno[Unresolved]() A>()
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt
index a7a842d5ff9..630f9066ee7 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt
@@ -7,23 +7,23 @@ String(abc)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] addCommaWarning: R|@R|Anno|(s = String(abc))  kotlin/Boolean| = Boolean(false)): R|ResolveMe| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] addCommaWarning: @Anno[Unresolved](String(abc)) Boolean = Boolean(false)): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt
index a5f7220024b..e2fb2ac3339 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt
@@ -3,26 +3,26 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types]()
+@Anno[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun t([ResolvedTo(RAW_FIR)] addCommaWarning: R|@R|Anno|()  kotlin/Boolean|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun t([ResolvedTo(RAW_FIR)] addCommaWarning: @Anno[Unresolved]() Boolean): R|kotlin/Unit| {
         }
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt
index 51342a2806c..def399d32d5 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt
@@ -3,30 +3,30 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types](value = String(abcd))
+@Anno[Unresolved](String(abcd))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArgumentsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun t([ResolvedTo(RAW_FIR)] addCommaWarning: R|@R|Anno|(value = String(abcd))  kotlin/Boolean|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun t([ResolvedTo(RAW_FIR)] addCommaWarning: @Anno[Unresolved](String(abcd)) Boolean): R|kotlin/Unit| {
         }
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.value] value: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.value] value: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: String = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt
index c1cc32e7aa5..21ccadcd8ee 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt
@@ -3,24 +3,24 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types](s = String(ab))
+@Anno[Unresolved](String(ab))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun R|@R|Anno|(s = String(ab))  kotlin/Int|.check(): R|kotlin/Int| {
-            ^check Int(1)
+        public? final? [ResolvedTo(RAW_FIR)] fun @Anno[Unresolved](String(ab)) Int.check(): <implicit> {
+            ^check IntegerLiteral(1)
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt
index 4dc0dbdc4ba..cc958090309 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt
@@ -3,24 +3,24 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: FromUseSiteTarget
 
 FIR element rendered:
-@RECEIVER:R|Anno|[Types](s = String(ab))
+@RECEIVER:Anno[Unresolved](String(ab))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| {
-            ^check Int(1)
+        public? final? [ResolvedTo(RAW_FIR)] fun @RECEIVER:Anno[Unresolved](String(ab)) Int.check(): <implicit> {
+            ^check IntegerLiteral(1)
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt
index b0f545365b4..07c2cdae5da 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt
@@ -1,27 +1,27 @@
 KT element: KtTypeReference
-FIR element: FirResolvedTypeRefImpl
+FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|Anno|
+@Anno[Unresolved](String(a))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val R|@R|Anno|(s = String(a))  kotlin/Int|.i: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] val @Anno[Unresolved](String(a)) Int.i: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
                 ^ String()
             }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt
index 125155facab..4252e13b40d 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt
@@ -3,25 +3,25 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types](s = String(a))
+@Anno[Unresolved](String(a))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val R|@R|Anno|(s = String(a))  kotlin/Int|.i: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] val @Anno[Unresolved](String(a)) Int.i: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
                 ^ String()
             }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt
index 05502105676..6e757604dff 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt
@@ -3,24 +3,24 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types](s = String(ab))
+@Anno[Unresolved](String(ab))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun check(): R|@R|Anno|(s = String(ab))  kotlin/Int| {
-            ^check Int(1)
+        public? final? [ResolvedTo(RAW_FIR)] fun check(): @Anno[Unresolved](String(ab)) Int {
+            ^check IntegerLiteral(1)
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt
index e93799b728e..631514ebd42 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt
@@ -3,23 +3,23 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|Anno|[Types](s = String(ab))
+@Anno[Unresolved](String(ab))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val i: R|@R|Anno|(s = String(ab))  kotlin/Int| = Int(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(s = String(ab))  kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val i: @Anno[Unresolved](String(ab)) Int = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(ab)) Int
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt
index 2f2ecef78bf..7584dfc43e1 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt
@@ -3,32 +3,32 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]()
+@PROPERTY_DELEGATE_FIELD:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] delegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(STATUS)] val a: <ERROR TYPE REF: Unresolved name: getValue>by <Unresolved name: lazy>#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
-                ^ Int(1)
+            field:@PROPERTY_DELEGATE_FIELD:Ann[Unresolved]() public? final? [ResolvedTo(RAW_FIR)] val a: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                IntegerLiteral(1)
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): <ERROR TYPE REF: Unresolved name: getValue> {
-                    ^ this@R|/X|.D|/X.a|.<Unresolved name: getValue>#(this@R|/X|, ::R|/X.a|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): <implicit> {
+                    ^ this@R|/X|.D|/X.a|.getValue#(this@R|/X|, ::R|/X.a|)
                 }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt
index 423d92764d0..9ee3d1d1b88 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt
@@ -3,28 +3,28 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@FIELD:R|Ann|[Types]()
+@FIELD:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] fieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/X.x] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            field:@FIELD:R|Ann|[Types]() public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|<local>/x|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit|
+            field:@FIELD:Ann[Unresolved]() public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt
index 78ecd9a82b8..69ef8a203f9 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt
@@ -9,11 +9,11 @@ FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] fileScript.kts
     @FILE:R|Ann|[Types]()
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(STATUS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt
index 826b75bc96a..24cc7796c96 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt
@@ -3,28 +3,28 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: FromUseSiteTarget
 
 FIR element rendered:
-@PROPERTY_GETTER:R|Ann|[Types]()
+@PROPERTY_GETTER:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] getterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/X.x] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|<local>/x|
-                @PROPERTY_GETTER:R|Ann|[Types]() public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
+                @PROPERTY_GETTER:Ann[Unresolved]() public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt
index 68bf920f98f..4c65b669101 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt
@@ -3,28 +3,28 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@CONSTRUCTOR_PARAMETER:R|Ann|[Types]()
+@CONSTRUCTOR_PARAMETER:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] paramScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:Ann[Unresolved]() x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|<local>/x|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt
index 74357e0780c..0adb32f70c2 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt
@@ -3,28 +3,28 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@PROPERTY:R|Ann|[Types]()
+@PROPERTY:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] propertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/X.x] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|Ann|[Types]() public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|<local>/x|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit|
+            @PROPERTY:Ann[Unresolved]() public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt
index 2a0fa3b6029..3c694eebba6 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt
@@ -3,28 +3,28 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: FromUseSiteTarget
 
 FIR element rendered:
-@SETTER_PARAMETER:R|Ann|[Types]()
+@SETTER_PARAMETER:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setParamScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/X.x] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|<local>/x|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|Ann|[Types]() value: R|kotlin/Int|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Ann[Unresolved]() value: Int): R|kotlin/Unit|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt
index 94ba261fdd0..9534377740e 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt
@@ -3,28 +3,28 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: FromUseSiteTarget
 
 FIR element rendered:
-@PROPERTY_SETTER:R|Ann|[Types]()
+@PROPERTY_SETTER:Ann[Unresolved]()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Ann| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/X.x] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|<local>/x|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                @PROPERTY_SETTER:R|Ann|[Types]() public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                @PROPERTY_SETTER:Ann[Unresolved]() public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callArgumentScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callArgumentScript.txt
index 9224b2fa0a4..ce657337e88 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callArgumentScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callArgumentScript.txt
@@ -3,17 +3,17 @@ FIR element: FirConstExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1)
+IntegerLiteral(1)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callArgumentScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun y([ResolvedTo(RAW_FIR)] a: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun y([ResolvedTo(RAW_FIR)] a: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
-            R|/y|(Int(1))
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+            y#(IntegerLiteral(1))
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt
index f5b5e7cd142..9fc39ce4954 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt
@@ -3,30 +3,30 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|/foo|()
+foo#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| {
+        public? open [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] x: ( () -> Unit )): R|B| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|B| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
-                super<R|B|>(Int(1), [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    R|/foo|()
+        public? final? [ResolvedTo(RAW_FIR)] class A : B {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                super<B>(IntegerLiteral(1), [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    foo#()
                 }
                 )
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/calllTypeArgumentsScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/calllTypeArgumentsScript.txt
index d2545c16aa2..f3c31bb1099 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/calllTypeArgumentsScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/calllTypeArgumentsScript.txt
@@ -3,17 +3,17 @@ FIR element: FirTypeProjectionWithVarianceImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/Int|
+Int
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] calllTypeArgumentsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> y(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> y(): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
-            R|/y|<R|kotlin/Int|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+            y#<Int>()
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt
index a06bfda6011..c20c11a3ba4 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt
@@ -3,24 +3,24 @@ FIR element: FirScriptImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
     [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-    public final [ResolvedTo(RAW_FIR)] var i: R|kotlin/Int| = Int(1)
-        public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-        public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit|
+    public? final? [ResolvedTo(RAW_FIR)] var i: <implicit> = IntegerLiteral(1)
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
 
-    R|/i| = R|/i|.R|kotlin/Int.plus|(Int(1))
+    +=(i#, IntegerLiteral(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVarScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var i: R|kotlin/Int| = Int(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var i: <implicit> = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
 
-        R|/i| = R|/i|.R|kotlin/Int.plus|(Int(1))
\ No newline at end of file
+        +=(i#, IntegerLiteral(1))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayAccessConventionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayAccessConventionScript.txt
index 9df0c8eef59..b0c67b30064 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayAccessConventionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayAccessConventionScript.txt
@@ -1,29 +1,24 @@
 KT element: KtBinaryExpression
-FIR element: FirFunctionCallImpl
+FIR element: FirAugmentedArraySetCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|<local>/<array>|.R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|(R|<local>/<index_0>|, R|<local>/<array>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/<index_0>|).R|kotlin/Int.plus|(Int(1)))
+ArraySet:[m#.get#(String(a)) += IntegerLiteral(1)]
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayAccessConventionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface MyMap<[ResolvedTo(STATUS)] K, [ResolvedTo(STATUS)] V> : R|kotlin/Any| {
-            public abstract operator [ResolvedTo(STATUS)] fun get([ResolvedTo(STATUS)] k: R|K|): R|V|
+        public? final? [ResolvedTo(RAW_FIR)] interface MyMap<[ResolvedTo(RAW_FIR)] K, [ResolvedTo(RAW_FIR)] V> : R|kotlin/Any| {
+            public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] k: K): V
 
-            public abstract operator [ResolvedTo(STATUS)] fun set([ResolvedTo(STATUS)] k: R|K|, [ResolvedTo(STATUS)] v: R|V|): R|kotlin/Unit|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] k: K, [ResolvedTo(RAW_FIR)] v: V): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test([ResolvedTo(RAW_FIR)] m: R|MyMap<kotlin/String, kotlin/Int>|): R|kotlin/Unit| {
-             {
-                [ResolvedTo(RAW_FIR)] lval <array>: R|MyMap<kotlin/String, kotlin/Int>| = R|<local>/m|
-                [ResolvedTo(RAW_FIR)] lval <index_0>: R|kotlin/String| = String(a)
-                R|<local>/<array>|.R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|(R|<local>/<index_0>|, R|<local>/<array>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/<index_0>|).R|kotlin/Int.plus|(Int(1)))
-            }
-
+        public? final? [ResolvedTo(RAW_FIR)] fun test([ResolvedTo(RAW_FIR)] m: MyMap<String, Int>): R|kotlin/Unit| {
+            ArraySet:[m#.get#(String(a)) += IntegerLiteral(1)]
             Unit
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayGetConventionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayGetConventionScript.txt
index af633406c06..cfc21e83824 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayGetConventionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayGetConventionScript.txt
@@ -1,27 +1,27 @@
 KT element: KtBinaryExpression
-FIR element: FirFunctionCallImpl
-FIR source kind: DesugaredCompoundAssignment
+FIR element: FirAugmentedArraySetCallImpl
+FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|<local>/m|.R|SubstitutionOverride</MyMap.get: R|A|>|(String(a)).R|/A.plusAssign|(Int(1))
+ArraySet:[m#.get#(String(a)) += IntegerLiteral(1)]
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayGetConventionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
-            public abstract operator [ResolvedTo(STATUS)] fun plusAssign([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface A : R|kotlin/Any| {
+            public? final? operator [ResolvedTo(RAW_FIR)] fun plusAssign([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface MyMap<[ResolvedTo(STATUS)] K, [ResolvedTo(STATUS)] V> : R|kotlin/Any| {
-            public abstract operator [ResolvedTo(STATUS)] fun get([ResolvedTo(STATUS)] k: R|K|): R|V|
+        public? final? [ResolvedTo(RAW_FIR)] interface MyMap<[ResolvedTo(RAW_FIR)] K, [ResolvedTo(RAW_FIR)] V> : R|kotlin/Any| {
+            public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] k: K): V
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test([ResolvedTo(RAW_FIR)] m: R|MyMap<kotlin/String, A>|): R|kotlin/Unit| {
-            R|<local>/m|.R|SubstitutionOverride</MyMap.get: R|A|>|(String(a)).R|/A.plusAssign|(Int(1))
+        public? final? [ResolvedTo(RAW_FIR)] fun test([ResolvedTo(RAW_FIR)] m: MyMap<String, A>): R|kotlin/Unit| {
+            ArraySet:[m#.get#(String(a)) += IntegerLiteral(1)]
             Unit
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt
index 77e58d6d123..32a245e33ee 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt
@@ -3,24 +3,24 @@ FIR element: FirDelegatedConstructorCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-super<R|B|>(Int(1))
+super<B>(IntegerLiteral(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorDelegationSuperCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|B| {
+        public? open [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] x: Int): R|B| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|B| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
-                super<R|B|>(Int(1))
+        public? final? [ResolvedTo(RAW_FIR)] class A : B {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                super<B>(IntegerLiteral(1))
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/functionCallArgumentListScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/functionCallArgumentListScript.txt
index 73f6a19803d..10a3f0fce0a 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/functionCallArgumentListScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/functionCallArgumentListScript.txt
@@ -1,19 +1,19 @@
 KT element: KtValueArgumentList
-FIR element: FirResolvedArgumentListImpl
+FIR element: FirArgumentListImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1)String(2)
+IntegerLiteral(1)String(2)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] functionCallArgumentListScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun callMe([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|, [ResolvedTo(RAW_FIR)] y: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun callMe([ResolvedTo(RAW_FIR)] x: Int, [ResolvedTo(RAW_FIR)] y: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
-            R|/callMe|(Int(1), String(2))
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+            callMe#(IntegerLiteral(1), String(2))
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/invokeCallArgumentListScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/invokeCallArgumentListScript.txt
index 6d0011d80ca..41f79ba2172 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/invokeCallArgumentListScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/invokeCallArgumentListScript.txt
@@ -1,16 +1,16 @@
 KT element: KtValueArgumentList
-FIR element: FirResolvedArgumentListImpl
+FIR element: FirArgumentListImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1)String(2)
+IntegerLiteral(1)String(2)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] invokeCallArgumentListScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] f: R|(kotlin/Int, kotlin/String) -> kotlin/Unit|): R|kotlin/Unit| {
-            R|<local>/f|.R|SubstitutionOverride<kotlin/Function2.invoke: R|kotlin/Unit|>|(Int(1), String(2))
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] f: ( (Int, String) -> Unit )): R|kotlin/Unit| {
+            f#(IntegerLiteral(1), String(2))
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt
index 04f36480df1..d3914d3b2a1 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt
@@ -1,29 +1,29 @@
 KT element: KtNameReferenceExpression
-FIR element: FirResolvedNamedReferenceImpl
+FIR element: FirPropertyAccessExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|/A.prop|
+B#.prop#
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] init: ( A.() -> Unit )): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val prop: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val prop: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] object B : R|A| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>([ResolvedTo(RAW_FIR)] fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] object B : A {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     ^ Unit
                 }
                 )
@@ -31,11 +31,11 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCallScript.kts
 
         }
 
-        public final [ResolvedTo(STATUS)] object C : R|A| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| {
-                super<R|A|>([ResolvedTo(RAW_FIR)] fun R|A|.<anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| {
-                        ^foo Q|B|.R|/A.prop|.R|kotlin/String.toString|()
+        public? final? [ResolvedTo(RAW_FIR)] object C : A {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
+                super<A>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+                        ^foo B#.prop#.toString#()
                     }
 
                 }
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt
index e0567de5303..41267f18ed7 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt
@@ -1,47 +1,82 @@
 KT element: KtArrayAccessExpression
-FIR element: FirResolvedNamedReferenceImpl
+FIR element: FirScriptImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|test/B.set|
+context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
+    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+    public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=test/B.n] n: Int): R|test/B| {
+            super<R|kotlin/Any|>()
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val n: Int = R|<local>/n|
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] get(): Int
+
+        public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] i: Int, [ResolvedTo(RAW_FIR)] a: B): R|kotlin/Unit| {
+        }
+
+        public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] i: Int): B {
+        }
+
+        public? final? operator [ResolvedTo(RAW_FIR)] fun inc(): B {
+        }
+
+    }
+
+    public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = B#(IntegerLiteral(1))
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+    public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> =  {
+        [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
+        [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(2)
+        [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
+        R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
+        R|<local>/<unary>|
+    }
+
+        public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setOperatorScript.kts
     package test
 
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=test/B.n] n: R|kotlin/Int|): R|test/B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=test/B.n] n: Int): R|test/B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val n: R|kotlin/Int| = R|<local>/n|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=B] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val n: Int = R|<local>/n|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] get(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun set([ResolvedTo(STATUS)] i: R|kotlin/Int|, [ResolvedTo(STATUS)] a: R|test/B|): R|kotlin/Unit| {
+            public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] i: Int, [ResolvedTo(RAW_FIR)] a: B): R|kotlin/Unit| {
             }
 
-            public final operator [ResolvedTo(STATUS)] fun get([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|test/B| {
+            public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] i: Int): B {
             }
 
-            public final operator [ResolvedTo(STATUS)] fun inc(): R|test/B| {
+            public? final? operator [ResolvedTo(RAW_FIR)] fun inc(): B {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] var a: R|test/B| = R|test/B.B|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|test/B|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|test/B|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = B#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|test/B| =  {
-            [ResolvedTo(RAW_FIR)] lval <array>: R|test/B| = R|test/a|
-            [ResolvedTo(RAW_FIR)] lval <index_0>: R|kotlin/Int| = Int(2)
-            [ResolvedTo(RAW_FIR)] lval <unary>: R|test/B| = R|<local>/<array>|.R|test/B.get|(R|<local>/<index_0>|)
-            R|<local>/<array>|.R|test/B.set|(R|<local>/<index_0>|, R|<local>/<unary>|.R|test/B.inc|())
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> =  {
+            [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
+            [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(2)
+            [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
+            R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
             R|<local>/<unary>|
         }
 
-            public [ResolvedTo(RAW_FIR)] get(): R|test/B|
\ No newline at end of file
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superTypeScript.txt
index 86dcfd8984b..5770833e6eb 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superTypeScript.txt
@@ -1,22 +1,27 @@
 KT element: KtTypeReference
-FIR element: FirResolvedTypeRefImpl
+FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|A|
+public? final? [ResolvedTo(RAW_FIR)] class C : A {
+    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
+        super<<implicit>>()
+    }
+
+}
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] superTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface A : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class C : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class C : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
+                super<<implicit>>()
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorParameterScript.txt
index b0d057662a4..f7f0d9c9cd1 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorParameterScript.txt
@@ -3,16 +3,16 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(STATUS)] resolveMe: R|kotlin/Int| = Int(5)
+[ResolvedTo(RAW_FIR)] resolveMe: Int = IntegerLiteral(5)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int| = Int(5)): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] resolveMe: Int = IntegerLiteral(5)): R|X| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorPropertyScript.txt
index 3d11afc50bf..0b9213aec58 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorPropertyScript.txt
@@ -3,20 +3,20 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(STATUS)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)
+[ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Abc.i] i: Int = IntegerLiteral(4)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Abc] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| {
+        public? final? [ResolvedTo(RAW_FIR)] class Abc : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Abc] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Abc.i] i: Int = IntegerLiteral(4)): R|Abc| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Abc] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Abc] get(): Int
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructionWithNoRValueScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructionWithNoRValueScript.txt
index d39a221e6f6..cb0823efecf 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructionWithNoRValueScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructionWithNoRValueScript.txt
@@ -3,16 +3,16 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val o: <ERROR TYPE REF: Unresolved name: component1> = R|<local>/<destruct>|.<Unresolved name: component1>#()
+public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val o: <implicit> = R|<local>/<destruct>|.component1#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructionWithNoRValueScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval <destruct>: <ERROR TYPE REF: Initializer required for destructuring declaration> = ERROR_EXPR(Initializer required for destructuring declaration)
-        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val o: <ERROR TYPE REF: Unresolved name: component1> = R|<local>/<destruct>|.<Unresolved name: component1>#()
+        [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval <destruct>: <implicit> = ERROR_EXPR(Initializer required for destructuring declaration)
+        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val o: <implicit> = R|<local>/<destruct>|.component1#()
 
 
-        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val r: <ERROR TYPE REF: Unresolved name: component2> = R|<local>/<destruct>|.<Unresolved name: component2>#()
\ No newline at end of file
+        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val r: <implicit> = R|<local>/<destruct>|.component2#()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntryScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntryScript.txt
index b8cd605a5f5..6ebaff68e7c 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntryScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntryScript.txt
@@ -3,16 +3,16 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
+[ResolvedTo(RAW_FIR)] lval a: <implicit> = R|<local>/<destruct>|.component1#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructuringEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun main(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/Int>| = Int(1).R|kotlin/to|<R|kotlin/Int|, R|kotlin/Int|>(Int(2))
-            [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
-            [ResolvedTo(RAW_FIR)] lval b: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|kotlin/Int|>|()
+        public? final? [ResolvedTo(RAW_FIR)] fun main(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval <destruct>: <implicit> = IntegerLiteral(1).to#(IntegerLiteral(2))
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = R|<local>/<destruct>|.component1#()
+            [ResolvedTo(RAW_FIR)] lval b: <implicit> = R|<local>/<destruct>|.component2#()
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt
index badff448baa..7e3e9ac2079 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt
@@ -3,27 +3,27 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/Int>| = R|/pair|
+[ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval <destruct>: <implicit> = pair#
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructuringScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var a: R|kotlin/Int| = Int(-1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = IntegerLiteral(-1)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
 
-        public final [ResolvedTo(RAW_FIR)] var b: R|kotlin/Int| = Int(0)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var b: <implicit> = IntegerLiteral(0)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
 
-        public final [ResolvedTo(RAW_FIR)] val pair: R|kotlin/Pair<kotlin/Int, kotlin/Int>| = R|kotlin/Pair.Pair|<R|kotlin/Int|, R|kotlin/Int|>(R|/a|, R|/b|)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Pair<kotlin/Int, kotlin/Int>|
+        public? final? [ResolvedTo(RAW_FIR)] val pair: <implicit> = Pair#(a#, b#)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/Int>| = R|/pair|
-        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val first: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
+        [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval <destruct>: <implicit> = pair#
+        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val first: <implicit> = R|<local>/<destruct>|.component1#()
 
 
-        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val last: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component2: R|kotlin/Int|>|()
\ No newline at end of file
+        public final [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableKey=<local>/<destruct>] val last: <implicit> = R|<local>/<destruct>|.component2#()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpressionScript.txt
index 70206b867cd..683c880c18a 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpressionScript.txt
@@ -12,11 +12,11 @@ object : R|kotlin/Any| {
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] objectLiteralExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
             object : R|kotlin/Any| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|kotlin/Any|>()
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralScript.txt
index 1932653b7e3..ae50a92c790 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralScript.txt
@@ -12,11 +12,11 @@ object : R|kotlin/Any| {
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] objectLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
             object : R|kotlin/Any| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|kotlin/Any|>()
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateScript.txt
index 007c9d4e06c..1051a67e996 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateScript.txt
@@ -3,21 +3,21 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
-    ^ Int(1)
+lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+    IntegerLiteral(1)
 }
 )
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] propertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int|by R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
-            ^ Int(1)
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            IntegerLiteral(1)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ D|/x|.R|kotlin/getValue|<R|kotlin/Int|>(Null(null), ::R|/x|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/x|.getValue#(Null(null), ::R|/x|)
             }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause1Script.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause1Script.txt
index 6e21df0b890..036ee3b50e6 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause1Script.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause1Script.txt
@@ -3,13 +3,13 @@ FIR element: FirTypeParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(RAW_FIR)] From : R|To|
+[ResolvedTo(RAW_FIR)] From : To
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] whereClause1Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] From : R|To|, [ResolvedTo(RAW_FIR)] To : R|kotlin/Any|> copyNotNull([ResolvedTo(RAW_FIR)] from: R|kotlin/collections/List<From>|, [ResolvedTo(RAW_FIR)] to: R|kotlin/collections/List<To>|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] From : To, [ResolvedTo(RAW_FIR)] To : Any> copyNotNull([ResolvedTo(RAW_FIR)] from: List<From>, [ResolvedTo(RAW_FIR)] to: List<To>): R|kotlin/Unit| {
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause2Script.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause2Script.txt
index 057bf89046c..f8596c1271e 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause2Script.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/whereClause2Script.txt
@@ -3,13 +3,13 @@ FIR element: FirTypeParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(RAW_FIR)] To : R|kotlin/Any|
+[ResolvedTo(RAW_FIR)] To : Any
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] whereClause2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] From : R|To|, [ResolvedTo(RAW_FIR)] To : R|kotlin/Any|> copyNotNull([ResolvedTo(RAW_FIR)] from: R|kotlin/collections/List<From>|, [ResolvedTo(RAW_FIR)] to: R|kotlin/collections/List<To>|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] From : To, [ResolvedTo(RAW_FIR)] To : Any> copyNotNull([ResolvedTo(RAW_FIR)] from: List<From>, [ResolvedTo(RAW_FIR)] to: List<To>): R|kotlin/Unit| {
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayAccessExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayAccessExpressionScript.txt
index 381d987bc34..de232e656b0 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayAccessExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayAccessExpressionScript.txt
@@ -3,14 +3,14 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|<local>/x|.R|SubstitutionOverride<kotlin/collections/List.get: R|kotlin/Int|>|(Int(1))
+x#.get#(IntegerLiteral(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] arrayAccessExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: R|kotlin/collections/List<kotlin/Int>|): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|.R|SubstitutionOverride<kotlin/collections/List.get: R|kotlin/Int|>|(Int(1))
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: List<Int>): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#.get#(IntegerLiteral(1))
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayIndexExpressionWithIncScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayIndexExpressionWithIncScript.txt
index b8ce04fa34d..0e0da3f59cc 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayIndexExpressionWithIncScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/arrayIndexExpressionWithIncScript.txt
@@ -3,20 +3,20 @@ FIR element: FirConstExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(0)
+IntegerLiteral(0)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] arrayIndexExpressionWithIncScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun main([ResolvedTo(RAW_FIR)] args: R|kotlin/Array<kotlin/String>|): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval a: R|java/util/ArrayList<kotlin/String>| = R|java/util/ArrayList.ArrayList|<R|kotlin/String|>()
-            R|<local>/a|.R|SubstitutionOverride<java/util/ArrayList.add: R|kotlin/Boolean|>|(String())
-            [ResolvedTo(RAW_FIR)] lval <array>: R|java/util/ArrayList<kotlin/String>| = R|<local>/a|
-            [ResolvedTo(RAW_FIR)] lval <index_0>: R|kotlin/Int| = Int(0)
-            [ResolvedTo(RAW_FIR)] lval <unary>: R|kotlin/String| = R|<local>/<array>|.R|SubstitutionOverride<java/util/ArrayList.get: R|@EnhancedNullability kotlin/String|>|(R|<local>/<index_0>|)
-            R|<local>/<array>|.R|SubstitutionOverride<java/util/ArrayList.set: R|@EnhancedNullability kotlin/String|>|(R|<local>/<index_0>|, R|<local>/<unary>|.<Unresolved name: inc>#())
+        public? final? [ResolvedTo(RAW_FIR)] fun main([ResolvedTo(RAW_FIR)] args: Array<String>): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = ArrayList#<String>()
+            a#.add#(String())
+            [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
+            [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(0)
+            [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
+            R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
             R|<local>/<unary>|
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt
index 59580b20a9a..23525962c88 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt
@@ -7,49 +7,49 @@ String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] assignment.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionOperatorScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionOperatorScript.txt
index 5d51a23d119..3e8e162ba66 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionOperatorScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionOperatorScript.txt
@@ -1,15 +1,15 @@
 KT element: KtOperationReferenceExpression
-FIR element: FirResolvedNamedReferenceImpl
+FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/Int.plus|
+IntegerLiteral(1).plus#(IntegerLiteral(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] binaryExpressionOperatorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(1).plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionScript.txt
index 63f7547d48f..70a7c73606c 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/binaryExpressionScript.txt
@@ -1,15 +1,15 @@
 KT element: KtBinaryExpression
-FIR element: FirIntegerLiteralOperatorCallImpl
+FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1).R|kotlin/Int.plus|(Int(1))
+IntegerLiteral(1).plus#(IntegerLiteral(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] binaryExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(1).plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/blockExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/blockExpressionScript.txt
index 0ca76f2e703..b12a97f1428 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/blockExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/blockExpressionScript.txt
@@ -8,9 +8,9 @@ FIR element rendered:
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] blockExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/boolLiteralScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/boolLiteralScript.txt
index 9f50b4ac9c8..e79a1a77b58 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/boolLiteralScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/boolLiteralScript.txt
@@ -7,9 +7,9 @@ Boolean(true)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] boolLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Boolean| = Boolean(true)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Boolean|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = Boolean(true)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt
index c3078e4cbd6..5a907892295 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt
@@ -3,53 +3,53 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|/Builder.Builder|()
+Builder#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideFunction.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt
index c02653dc4e4..ecfd34fba21 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt
@@ -3,53 +3,53 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-this@R|special/anonymous|.R|/Builder.execute|()
+execute#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionRangeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionRangeScript.txt
index 46bdec07162..a17cfd5b4a2 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionRangeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionRangeScript.txt
@@ -3,19 +3,19 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(0).R|kotlin/Int.rangeTo|(Int(1))
+IntegerLiteral(0).rangeTo#(IntegerLiteral(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] forExpressionRangeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
              {
-                [ResolvedTo(RAW_FIR)] lval <iterator>: R|kotlin/collections/IntIterator| = Int(0).R|kotlin/Int.rangeTo|(Int(1)).R|kotlin/ranges/IntProgression.iterator|()
-                while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()) {
-                    [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+                [ResolvedTo(RAW_FIR)] lval <iterator>: <implicit> = IntegerLiteral(0).rangeTo#(IntegerLiteral(1)).iterator#()
+                while(R|<local>/<iterator>|.hasNext#()) {
+                    [ResolvedTo(RAW_FIR)] lval x: <implicit> = R|<local>/<iterator>|.next#()
                      {
                     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionScript.txt
index 925b6b22fee..58d6fedb93d 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionScript.txt
@@ -3,8 +3,8 @@ FIR element: FirWhileLoopImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()) {
-    [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+while(R|<local>/<iterator>|.hasNext#()) {
+    [ResolvedTo(RAW_FIR)] lval x: <implicit> = R|<local>/<iterator>|.next#()
      {
     }
 
@@ -12,15 +12,15 @@ while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterato
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] forExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
              {
-                [ResolvedTo(RAW_FIR)] lval <iterator>: R|kotlin/collections/IntIterator| = Int(0).R|kotlin/Int.rangeTo|(Int(1)).R|kotlin/ranges/IntProgression.iterator|()
-                while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()) {
-                    [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+                [ResolvedTo(RAW_FIR)] lval <iterator>: <implicit> = IntegerLiteral(0).rangeTo#(IntegerLiteral(1)).iterator#()
+                while(R|<local>/<iterator>|.hasNext#()) {
+                    [ResolvedTo(RAW_FIR)] lval x: <implicit> = R|<local>/<iterator>|.next#()
                      {
                     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariableScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariableScript.txt
index 313b255d6d3..9e12c6e6477 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariableScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariableScript.txt
@@ -3,19 +3,19 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+[ResolvedTo(RAW_FIR)] lval x: <implicit> = R|<local>/<iterator>|.next#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] forExpressionVariableScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
              {
-                [ResolvedTo(RAW_FIR)] lval <iterator>: R|kotlin/collections/IntIterator| = Int(0).R|kotlin/Int.rangeTo|(Int(1)).R|kotlin/ranges/IntProgression.iterator|()
-                while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()) {
-                    [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+                [ResolvedTo(RAW_FIR)] lval <iterator>: <implicit> = IntegerLiteral(0).rangeTo#(IntegerLiteral(1)).iterator#()
+                while(R|<local>/<iterator>|.hasNext#()) {
+                    [ResolvedTo(RAW_FIR)] lval x: <implicit> = R|<local>/<iterator>|.next#()
                      {
                     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/ifExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/ifExpressionScript.txt
index 593655ccc9c..49942413688 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/ifExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/ifExpressionScript.txt
@@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
 when () {
-    (R|<local>/x| is R|kotlin/String|) ->  {
+    (x# is String) ->  {
         String(1)
     }
     else ->  {
@@ -14,13 +14,13 @@ when () {
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] ifExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: R|kotlin/Any|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: Any): String {
             ^foo when () {
-                (R|<local>/x| is R|kotlin/String|) ->  {
+                (x# is String) ->  {
                     String(1)
                 }
                 else ->  {
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/incExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/incExpressionScript.txt
index 942d8527edf..eb7ffb518aa 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/incExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/incExpressionScript.txt
@@ -1,22 +1,17 @@
 KT element: KtPostfixExpression
-FIR element: FirVariableAssignmentImpl
-FIR source kind: DesugaredIncrementOrDecrement
+FIR element: FirIncrementDecrementExpressionImpl
+FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|<local>/nextUnnamedLibraryIndex| = R|<local>/<unary>|.R|kotlin/Int.inc|()
+nextUnnamedLibraryIndex#++
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] incExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun main([ResolvedTo(RAW_FIR)] args: R|kotlin/Array<kotlin/String>|): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lvar nextUnnamedLibraryIndex: R|kotlin/Int| = Int(1)
-            [ResolvedTo(RAW_FIR)] lval originalName: R|kotlin/String| = <strcat>( {
-                [ResolvedTo(RAW_FIR)] lval <unary>: R|kotlin/Int| = R|<local>/nextUnnamedLibraryIndex|
-                R|<local>/nextUnnamedLibraryIndex| = R|<local>/<unary>|.R|kotlin/Int.inc|()
-                R|<local>/<unary>|
-            }
-            )
+        public? final? [ResolvedTo(RAW_FIR)] fun main([ResolvedTo(RAW_FIR)] args: Array<String>): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lvar nextUnnamedLibraryIndex: <implicit> = IntegerLiteral(1)
+            [ResolvedTo(RAW_FIR)] lval originalName: <implicit> = <strcat>(nextUnnamedLibraryIndex#++)
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTargetScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTargetScript.txt
index 4e48b6a933f..a6c472d059f 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTargetScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTargetScript.txt
@@ -3,17 +3,17 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/collections/mutableListOf|<R|kotlin/String|>()
+mutableListOf#<String>()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] insidePlusAssignTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: R|kotlin/collections/MutableMap<kotlin/Int, kotlin/collections/MutableList<kotlin/String>>|): R|kotlin/Unit| {
-            R|<local>/x|.R|kotlin/collections/getOrPut|<R|kotlin/Int|, R|kotlin/collections/MutableList<kotlin/String>|>(Int(1), <L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<V>] getOrPut@fun <anonymous>(): R|kotlin/collections/MutableList<kotlin/String>| <inline=Inline, kind=UNKNOWN>  {
-                ^ R|kotlin/collections/mutableListOf|<R|kotlin/String|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: MutableMap<Int, MutableList<String>>): R|kotlin/Unit| {
+            +=(x#.getOrPut#(IntegerLiteral(1), <L> = [ResolvedTo(RAW_FIR)] getOrPut@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                mutableListOf#<String>()
             }
-            ).R|kotlin/collections/plusAssign|<R|kotlin/String|>(String(str))
+            ), String(str))
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/intLiteralScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/intLiteralScript.txt
index e9cde271593..ae7cfc33dcb 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/intLiteralScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/intLiteralScript.txt
@@ -3,13 +3,13 @@ FIR element: FirConstExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1)
+IntegerLiteral(1)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] intLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int| = Int(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/isExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/isExpressionScript.txt
index 5452c985a02..7e2ec28bc0b 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/isExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/isExpressionScript.txt
@@ -3,14 +3,14 @@ FIR element: FirTypeOperatorCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-(R|<local>/x| is R|kotlin/String|)
+(x# is String)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] isExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: R|kotlin/Any|): R|kotlin/Boolean| {
-            ^foo (R|<local>/x| is R|kotlin/String|)
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: Any): Boolean {
+            ^foo (x# is String)
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpressionScript.txt
index 9d977bcc9d6..39d6ed82d3b 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpressionScript.txt
@@ -3,24 +3,24 @@ FIR element: FirAnonymousObjectExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-object : R|kotlin/Any| {
+object : Any {
     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-        super<R|kotlin/Any|>()
+        super<<implicit>>()
     }
 
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] objectLiteralExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Any| = object : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = object : Any {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                super<R|kotlin/Any|>()
+                super<<implicit>>()
             }
 
         }
 
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Any|
\ No newline at end of file
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/parenthesizedExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/parenthesizedExpressionScript.txt
index 0e54dae8372..3a2848f3773 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/parenthesizedExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/parenthesizedExpressionScript.txt
@@ -1,15 +1,15 @@
 KT element: KtParenthesizedExpression
-FIR element: FirIntegerLiteralOperatorCallImpl
+FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1).R|kotlin/Int.plus|(Int(2))
+IntegerLiteral(1).plus#(IntegerLiteral(2))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] parenthesizedExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(2))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(1).plus#(IntegerLiteral(2))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringLiteralScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringLiteralScript.txt
index e5231a114ab..f0d615ec7f1 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringLiteralScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringLiteralScript.txt
@@ -7,9 +7,9 @@ String(string)
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] stringLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/String| = String(string)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = String(string)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringTemplateExpressionEntryScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringTemplateExpressionEntryScript.txt
index fdfa460f5ec..3903c7623eb 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringTemplateExpressionEntryScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/stringTemplateExpressionEntryScript.txt
@@ -1,15 +1,15 @@
 KT element: KtBlockStringTemplateEntry
-FIR element: FirIntegerLiteralOperatorCallImpl
+FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Int(1).R|kotlin/Int.plus|(Int(2))
+IntegerLiteral(1).plus#(IntegerLiteral(2))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] stringTemplateExpressionEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/String| = <strcat>(String(string ), Int(1).R|kotlin/Int.plus|(Int(2)), String( template))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = <strcat>(String(string ), IntegerLiteral(1).plus#(IntegerLiteral(2)), String( template))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/throwExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/throwExpressionScript.txt
index 36c6401e46e..7b095e2f80d 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/throwExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/throwExpressionScript.txt
@@ -3,14 +3,14 @@ FIR element: FirThrowExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-throw R|java/lang/IllegalStateException.IllegalStateException|()
+throw IllegalStateException#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] throwExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
-            throw R|java/lang/IllegalStateException.IllegalStateException|()
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+            throw IllegalStateException#()
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpressionScript.txt
index 4bc4fc6306d..83b2630e5ff 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpressionScript.txt
@@ -4,24 +4,24 @@ FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
 try {
-    Int(1)
+    IntegerLiteral(1)
 }
-catch ([ResolvedTo(RAW_FIR)] [IsCatchParameterProperty=true] e: R|kotlin/Throwable|) {
+catch ([ResolvedTo(RAW_FIR)] [IsCatchParameterProperty=true] e: Throwable) {
 }
 finally {
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] tryExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
             try {
-                Int(1)
+                IntegerLiteral(1)
             }
-            catch ([ResolvedTo(RAW_FIR)] [IsCatchParameterProperty=true] e: R|kotlin/Throwable|) {
+            catch ([ResolvedTo(RAW_FIR)] [IsCatchParameterProperty=true] e: Throwable) {
             }
             finally {
             }
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whenExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whenExpressionScript.txt
index b50e627faa6..6d1167b0455 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whenExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whenExpressionScript.txt
@@ -3,8 +3,8 @@ FIR element: FirWhenExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-when (R|<local>/x|) {
-    ($subj$ is R|kotlin/String|) ->  {
+when (x#) {
+    ($subj$ is String) ->  {
         String(1)
     }
     else ->  {
@@ -14,13 +14,13 @@ when (R|<local>/x|) {
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] whenExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: R|kotlin/Any|): R|kotlin/String| {
-            ^foo when (R|<local>/x|) {
-                ($subj$ is R|kotlin/String|) ->  {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] x: Any): String {
+            ^foo when (x#) {
+                ($subj$ is String) ->  {
                     String(1)
                 }
                 else ->  {
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whileExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whileExpressionScript.txt
index 3c9e972eca0..279fb52c0de 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whileExpressionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/whileExpressionScript.txt
@@ -8,11 +8,11 @@ while(Boolean(true)) {
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] whileExpressionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             while(Boolean(true)) {
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/wholeStringTemplateScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/wholeStringTemplateScript.txt
index bec14d79333..6939b4e17ca 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/wholeStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/wholeStringTemplateScript.txt
@@ -3,13 +3,13 @@ FIR element: FirStringConcatenationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-<strcat>(String(string ), Int(1).R|kotlin/Int.plus|(Int(2)), String( template))
+<strcat>(String(string ), IntegerLiteral(1).plus#(IntegerLiteral(2)), String( template))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] wholeStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/String| = <strcat>(String(string ), Int(1).R|kotlin/Int.plus|(Int(2)), String( template))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = <strcat>(String(string ), IntegerLiteral(1).plus#(IntegerLiteral(2)), String( template))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt
index dd1f4c506a4..8bcac3b7195 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt
@@ -1,33 +1,33 @@
 KT element: KtNameReferenceExpression
-FIR element: FirResolvedQualifierImpl
+FIR element: FirPropertyAccessExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-Q|A.B|
+A#
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] firstPartOfQualifiedCallWithNestedClassesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|A.B| {
+            public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|A.B| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|A.B.C| {
+                public? final? [ResolvedTo(RAW_FIR)] class C : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|A.B.C| {
                         super<R|kotlin/Any|>()
                     }
 
-                    public final [ResolvedTo(STATUS)] val x: R|kotlin/Int| = Int(10)
-                        public [ResolvedTo(STATUS)] [ContainingClassKey=C] get(): R|kotlin/Int|
+                    public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(10)
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): <implicit>
 
                 }
 
@@ -35,6 +35,6 @@ FILE: [ResolvedTo(IMPORTS)] firstPartOfQualifiedCallWithNestedClassesScript.kts
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
-            Q|A.B|.R|/A.B.C.C|().R|/A.B.C.x|
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+            A#.B#.C#().x#
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt
index 16b71b73a34..ead681b3948 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt
@@ -3,27 +3,21 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-<Unresolved name: peek>#()
+peek#()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedPartOfQualifiedCallUnresolvedScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class FF : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=FF] constructor(): R|FF| {
+        public? final? [ResolvedTo(RAW_FIR)] class FF : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FF] constructor(): R|FF| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun handleLeftBracketInFragment(): R|kotlin/Unit| {
-                 {
-                    [ResolvedTo(RAW_FIR)] lval <receiver>: <ERROR TYPE REF: Unresolved name: peek> = <Unresolved name: peek>#()
-                    [ResolvedTo(RAW_FIR)] lval <unary>: <ERROR TYPE REF: Unresolved name: braceBalance> = R|<local>/<receiver>|.<Unresolved name: braceBalance>#
-                    R|<local>/<receiver>|.<Unresolved name: braceBalance># = R|<local>/<unary>|.<Unresolved name: inc>#()
-                    R|<local>/<unary>|
-                }
-
+            public? final? [ResolvedTo(RAW_FIR)] fun handleLeftBracketInFragment(): R|kotlin/Unit| {
+                peek#().braceBalance#++
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeScript.txt
index 8abd8bc4cdd..f4b87ed19d0 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeScript.txt
@@ -1,19 +1,19 @@
 KT element: KtTypeReference
-FIR element: FirResolvedTypeRefImpl
+FIR element: FirFunctionTypeRefImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|(kotlin/Int) -> kotlin/String|
+( (Int) -> String )
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] functionalTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|(kotlin/Int) -> kotlin/String| {
-            ^x [ResolvedTo(RAW_FIR)] fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|kotlin/Int|): R|kotlin/String| <inline=Unknown>  {
-                ^ String()
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): ( (Int) -> String ) {
+            ^x [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                String()
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt
index af2cfbfc196..8a861614acf 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt
@@ -1,23 +1,24 @@
 KT element: KtTypeReference
-FIR element: FirErrorTypeRefImpl
+FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-<ERROR TYPE REF: Symbol not found for Nested>
+public? final? [ResolvedTo(RAW_FIR)] fun create(): Nested {
+}
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] nestedClassTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class Nested : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Nested] constructor(): R|Foo.Nested| {
+            public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor(): R|Foo.Nested| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -25,12 +26,12 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassTypeScript.kts
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<Foo>()
             }
 
-            public final [ResolvedTo(STATUS)] fun create(): <ERROR TYPE REF: Symbol not found for Nested> {
+            public? final? [ResolvedTo(RAW_FIR)] fun create(): Nested {
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeScript.txt
index 7d0b0b11ce6..e63c6cde773 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeScript.txt
@@ -1,16 +1,18 @@
 KT element: KtTypeReference
-FIR element: FirResolvedTypeRefImpl
+FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/Int?|
+public? final? [ResolvedTo(RAW_FIR)] fun x(): Int? {
+    ^x IntegerLiteral(1)
+}
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] nullableTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Int?| {
-            ^x Int(1)
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): Int? {
+            ^x IntegerLiteral(1)
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt
index 7f43c096a3b..e5608355b21 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt
@@ -1,21 +1,22 @@
 KT element: KtNameReferenceExpression
-FIR element: FirResolvedTypeRefImpl
+FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|T|
+public? final? [ResolvedTo(RAW_FIR)] fun <@A[Unresolved]() [ResolvedTo(RAW_FIR)] T> T.test(): R|kotlin/Unit| {
+}
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] receiverTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <@R|A|[Types]() [ResolvedTo(RAW_FIR)] T> R|T|.test(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <@A[Unresolved]() [ResolvedTo(RAW_FIR)] T> T.test(): R|kotlin/Unit| {
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|)) public final [ResolvedTo(STATUS)] annotation class A : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        @Target[Unresolved](AnnotationTarget#.TYPE_PARAMETER#) public? final? [ResolvedTo(RAW_FIR)] annotation class A : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeTypeScript.txt
index ec7425e2af8..7043b07a330 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeTypeScript.txt
@@ -1,16 +1,18 @@
 KT element: KtTypeReference
-FIR element: FirResolvedTypeRefImpl
+FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/collections/Map<kotlin/String, kotlin/collections/List<kotlin/Int>>|
+public? final? [ResolvedTo(RAW_FIR)] fun x(): Map<String, List<Int>> {
+    ^x IntegerLiteral(1)
+}
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] wholeTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/collections/Map<kotlin/String, kotlin/collections/List<kotlin/Int>>| {
-            ^x Int(1)
+        public? final? [ResolvedTo(RAW_FIR)] fun x(): Map<String, List<Int>> {
+            ^x IntegerLiteral(1)
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt
index d541302e891..239c0e88761 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt
@@ -3,60 +3,60 @@ FIR element: FirVariableAssignmentImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|/builder|.R|/Builder.version| = String()
+builder#.version# = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
-            public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                    super<R|Builder|>()
+            public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                    super<Builder>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt
index 2f52aa57c83..3a68ae37a1d 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt
@@ -3,22 +3,22 @@ FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-    public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
         super<R|kotlin/Any|>()
     }
 
-    public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+    public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-    public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-        <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+    public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+        println#(version#)
     }
 
-    public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-            super<R|Builder|>()
+    public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+            super<Builder>()
         }
 
     }
@@ -27,56 +27,56 @@ public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] class.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
-            public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                    super<R|Builder|>()
+            public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                    super<Builder>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeterScript.txt
index 1b60a55b904..2700ddbe680 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeterScript.txt
@@ -3,16 +3,16 @@ FIR element: FirTypeParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(STATUS)] T
+[ResolvedTo(RAW_FIR)] T
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] classTypeParemeterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt
index 494ef4f5bf5..20045f699ec 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt
@@ -3,27 +3,27 @@ FIR element: FirEnumEntryImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry ENTRY: R|X|
+public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry ENTRY: R|X|
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry ENTRY: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry ENTRY: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt
index a3039fd2e93..169fe765e0c 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt
@@ -3,62 +3,62 @@ FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-    ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+    ^build Builder#().apply#(action#)
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] function.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
-            public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                    super<R|Builder|>()
+            public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                    super<Builder>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getterScript.txt
index 35becd4bc29..ff37fdd19f0 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getterScript.txt
@@ -3,17 +3,17 @@ FIR element: FirPropertyAccessorImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
+public? [ResolvedTo(RAW_FIR)] get(): String {
     ^ String()
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] getterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] val x: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
                 ^ String()
             }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClassScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClassScript.txt
index a1663ad052d..4c5e9c329cb 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClassScript.txt
@@ -3,28 +3,28 @@ FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-local final [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
-    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
+local final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
         super<R|kotlin/Any|>()
     }
 
-    public final [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/String|
+    public? final? [ResolvedTo(RAW_FIR)] fun y(): String
 
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] localClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] fun y(): String
 
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunctionScript.txt
index 0afacf3f716..ba687b1adcf 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunctionScript.txt
@@ -3,18 +3,18 @@ FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-local final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/String| {
+local final? [ResolvedTo(RAW_FIR)] fun x(): String {
     ^x String()
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun x(): String {
                 ^x String()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localPropertyScript.txt
index e0e946e627a..556111396fe 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localPropertyScript.txt
@@ -3,14 +3,14 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(RAW_FIR)] lval x: R|kotlin/String| = String()
+[ResolvedTo(RAW_FIR)] lval x: String = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] localPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|kotlin/String| = String()
+        public? final? [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: String = String()
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt
index f3f6ccccb5f..f5116352e60 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt
@@ -3,22 +3,22 @@ FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(STATUS)] fun x(): R|kotlin/String| {
+public? final? [ResolvedTo(RAW_FIR)] fun x(): String {
     ^x String()
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] memberFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| {
+        public? final? [ResolvedTo(RAW_FIR)] class Y : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Y] constructor(): R|Y| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun x(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun x(): String {
                 ^x String()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt
index 8c3cb4fa163..bb2ec8023b6 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt
@@ -3,21 +3,21 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(STATUS)] val x: R|kotlin/String| = String()
-    public [ResolvedTo(STATUS)] [ContainingClassKey=Y] get(): R|kotlin/String|
+public? final? [ResolvedTo(RAW_FIR)] val x: String = String()
+    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Y] get(): String
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] memberPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| {
+        public? final? [ResolvedTo(RAW_FIR)] class Y : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Y] constructor(): R|Y| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val x: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Y] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val x: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Y] get(): String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt
index 4dcc20c4748..22965a97ad5 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt
@@ -3,19 +3,19 @@ FIR element: FirTypeAliasImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public? final [ResolvedTo(RAW_FIR)] typealias Str = R|kotlin/String|
+public? final [ResolvedTo(RAW_FIR)] typealias Str = String
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] memberTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| {
+        public? final? [ResolvedTo(RAW_FIR)] class Y : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Y] constructor(): R|Y| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias Str = R|kotlin/String|
+            public? final [ResolvedTo(RAW_FIR)] typealias Str = String
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt
index 2816b790e86..bf4639cd591 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt
@@ -3,32 +3,32 @@ FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-    public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|Y.X| {
+public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|Y.X| {
         super<R|kotlin/Any|>()
     }
 
-    public final [ResolvedTo(STATUS)] fun y(): R|kotlin/String|
+    public? final? [ResolvedTo(RAW_FIR)] fun y(): String
 
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| {
+        public? final? [ResolvedTo(RAW_FIR)] class Y : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Y] constructor(): R|Y| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|Y.X| {
+            public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|Y.X| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun y(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] fun y(): String
 
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt
index cf8bf7f4c4e..fdd4d82b849 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt
@@ -3,16 +3,16 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(STATUS)] x: R|kotlin/Int|
+[ResolvedTo(RAW_FIR)] x: Int
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorValueParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt
index e64238dd538..54c809db4ac 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt
@@ -3,112 +3,112 @@ FIR element: FirScriptImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
     [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-    public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+    public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-        public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-            <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+        public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            println#(version#)
         }
 
-        public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                super<R|Builder|>()
+        public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                super<Builder>()
             }
 
         }
 
     }
 
-    public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-        ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+    public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+        ^build Builder#().apply#(action#)
     }
 
-    R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-        this@R|special/anonymous|.R|/Builder.version| = String(123)
-        local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+    build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        version# = String(123)
+        local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
             }
 
         }
 
-        this@R|special/anonymous|.R|/Builder.execute|()
+        execute#()
     }
     )
-    public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-        this@R|special/anonymous|.R|/Builder.version| = String(321)
+    public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        version# = String(321)
     }
     )
-        public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-    R|/builder|.R|/Builder.execute|()
-    R|/builder|.R|/Builder.version| = String()
+    builder#.execute#()
+    builder#.version# = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
-            public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                    super<R|Builder|>()
+            public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                    super<Builder>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt
index fb5c30e9d2e..da3a821c4c3 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt
@@ -3,21 +3,21 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-[ResolvedTo(STATUS)] y: R|kotlin/String|
+[ResolvedTo(RAW_FIR)] y: String
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] x: Int): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] y: R|kotlin/String|): R|X| {
-                this<R|X|>(Int(1))
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor([ResolvedTo(RAW_FIR)] y: String): R|X| {
+                this<R|X|>(IntegerLiteral(1))
             }
 
         }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setterScript.txt
index 63a5b981b58..f07877fb52e 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setterScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setterScript.txt
@@ -3,16 +3,16 @@ FIR element: FirPropertyAccessorImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
 }
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var x: String
+            public? [ResolvedTo(RAW_FIR)] get(): String
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt
index 893f327dd46..b2f74032f2a 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt
@@ -3,112 +3,112 @@ FIR element: FirScriptImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
     [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-    public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+    public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-        public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-            <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+        public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            println#(version#)
         }
 
-        public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                super<R|Builder|>()
+        public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                super<Builder>()
             }
 
         }
 
     }
 
-    public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-        ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+    public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+        ^build Builder#().apply#(action#)
     }
 
-    R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-        this@R|special/anonymous|.R|/Builder.version| = String(123)
-        local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+    build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        version# = String(123)
+        local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
             }
 
         }
 
-        this@R|special/anonymous|.R|/Builder.execute|()
+        execute#()
     }
     )
-    public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-        this@R|special/anonymous|.R|/Builder.version| = String(321)
+    public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        version# = String(321)
     }
     )
-        public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-    R|/builder|.R|/Builder.execute|()
-    R|/builder|.R|/Builder.version| = String()
+    builder#.execute#()
+    builder#.version# = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                <Unresolved name: println>#(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
-            public final [ResolvedTo(STATUS)] class NestedBuilder : R|Builder| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
-                    super<R|Builder|>()
+            public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| {
+                    super<Builder>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
\ No newline at end of file
+        builder#.execute#()
+        builder#.version# = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelPropertyScript.txt
index d71be54a6e1..3e2a9911df9 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelPropertyScript.txt
@@ -3,14 +3,14 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int| = Int(1)
-    public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(1)
+    public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] topLevelPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int| = Int(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
\ No newline at end of file
+        public? final? [ResolvedTo(RAW_FIR)] val x: <implicit> = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAliasScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAliasScript.txt
index 65035fad981..0b24a2e90d5 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAliasScript.txt
@@ -3,12 +3,12 @@ FIR element: FirTypeAliasImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final [ResolvedTo(RAW_FIR)] typealias Str = R|kotlin/String|
+public? final [ResolvedTo(RAW_FIR)] typealias Str = String
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] topLevelTypelTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias Str = R|kotlin/String|
\ No newline at end of file
+        public? final [ResolvedTo(RAW_FIR)] typealias Str = String
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt
index 288465d78ea..2fcee7ab7a9 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt
@@ -1,755 +1,755 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
                 super<R|kotlin/Enum<EnumClass>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array<EnumClass>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|EnumClass| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries<EnumClass>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<EnumClass>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|<local>/str|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|<local>/ann|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|<local>/c|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|<local>/entry|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|<local>/entry|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = <Unresolved name: boo>#()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = <getClass>(Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), <getClass>(AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt
index 427bc84b9b3..e4565f19c45 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt
@@ -1,11 +1,11 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -28,12 +28,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -42,12 +42,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -56,12 +56,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -70,12 +70,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -84,12 +84,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -98,12 +98,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -112,12 +112,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -126,12 +126,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -140,12 +140,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -154,12 +154,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -168,12 +168,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
@@ -182,12 +182,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
+        @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt
index b797d4fb4ca..91c3c8f6891 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt
@@ -1,29 +1,29 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -34,30 +34,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -68,30 +68,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,30 +102,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -136,30 +136,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -170,30 +170,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -204,30 +204,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -238,30 +238,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -272,30 +272,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -306,30 +306,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -340,30 +340,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -374,30 +374,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -408,30 +408,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -442,30 +442,30 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt
index 2c7c04b6733..55b607c1a30 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt
@@ -1,45 +1,45 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -47,46 +47,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -94,46 +94,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -141,46 +141,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -188,46 +188,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -235,46 +235,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -282,46 +282,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -329,46 +329,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -376,46 +376,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -423,46 +423,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -470,46 +470,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -517,46 +517,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -564,46 +564,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -611,46 +611,46 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum<X>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Enum<X>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<X>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<X>|
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: <ERROR TYPE REF: Symbol not found for A.X>): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
-            @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt
index 742f6b91ba1..86de1767583 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt
@@ -2,11 +2,11 @@ RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -14,11 +14,11 @@ IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -26,11 +26,11 @@ COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -38,11 +38,11 @@ COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -50,11 +50,11 @@ SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -62,11 +62,11 @@ TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -74,11 +74,11 @@ STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -86,11 +86,11 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -98,11 +98,11 @@ ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -110,11 +110,11 @@ CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -122,11 +122,11 @@ IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -134,11 +134,11 @@ ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -146,11 +146,11 @@ BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -158,10 +158,10 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+        @Suppress[Unresolved](String(2)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
index 214ba575f8c..3e80762a180 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
@@ -1,28 +1,28 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -30,29 +30,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -60,29 +60,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -90,29 +90,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -120,29 +120,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -150,29 +150,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -180,29 +180,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -210,29 +210,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -240,29 +240,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -270,29 +270,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -300,29 +300,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -330,29 +330,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -360,29 +360,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
@@ -390,29 +390,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 )
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
index 1f5ac261f25..9ac2a9e1340 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
@@ -1,28 +1,28 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -30,29 +30,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -60,29 +60,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -90,29 +90,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -120,29 +120,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -150,29 +150,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -180,29 +180,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -210,29 +210,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -240,29 +240,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -270,29 +270,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -300,29 +300,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -330,29 +330,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -360,29 +360,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -390,29 +390,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(str))  kotlin/String?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(str))  kotlin/String?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(str)) String?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(str)) String? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(str))  kotlin/String|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(str))  kotlin/String|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
index 7c2bb5153d4..9f04bcb4538 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
@@ -1,28 +1,28 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -30,29 +30,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -60,29 +60,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -90,29 +90,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -120,29 +120,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -150,29 +150,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -180,29 +180,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -210,29 +210,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -240,29 +240,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -270,29 +270,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -300,29 +300,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -330,29 +330,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -360,29 +360,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
@@ -390,29 +390,29 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.TYPE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.message] message: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val message: R|kotlin/String| = R|<local>/message|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val message: String = R|<local>/message|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?|
-            public [ResolvedTo(RAW_FIR)] get(): R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>?| {
+        public? final? [ResolvedTo(RAW_FIR)] val nullablePropertyWithAnnotatedType: @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>?
+            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](String(outer)) List<@Anno[Unresolved](String(middle)) List<@Anno[Unresolved](String(inner)) Int>>? {
                 ^ Null(null)
             }
 
-        public final [ResolvedTo(RAW_FIR)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ R|/nullablePropertyWithAnnotatedType|?.{ $subj$.R|kotlin/let|<R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|, R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function1<T, R>] let@fun <anonymous>([ResolvedTo(BODY_RESOLVE)] it: R|@R|Anno|(message = String(outer))  kotlin/collections/List<@R|Anno|(message = String(middle))  kotlin/collections/List<@R|Anno|(message = String(inner))  kotlin/Int>>|): R|kotlin/String| <inline=Inline, kind=EXACTLY_ONCE>  {
-                    ^ <strcat>(String( (), R|<local>/it|, String()))
+        public? final? [ResolvedTo(RAW_FIR)] val propertyToResolve: String
+            public? [ResolvedTo(RAW_FIR)] get(): String {
+                ^ nullablePropertyWithAnnotatedType#?.{ $subj$.let#(<L> = [ResolvedTo(RAW_FIR)] let@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    <strcat>(String( (), it#, String()))
                 }
                 ) } ?: String()
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt
index 45e6f9728d0..8b7af34f8d0 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt
@@ -1,27 +1,27 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -30,28 +30,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -60,28 +60,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -90,28 +90,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -120,28 +120,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -150,28 +150,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -180,28 +180,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -210,28 +210,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -240,28 +240,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -270,28 +270,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -300,28 +300,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -330,28 +330,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -360,28 +360,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
@@ -390,28 +390,28 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
-                this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+                receive#(functionWithLazyBody#())
             }
 
-            public final [ResolvedTo(STATUS)] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| {
-                    ^ this@R|/A|.F|/A.x|
+            public? final? [ResolvedTo(RAW_FIR)] val x: Int = IntegerLiteral(10)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int {
+                    ^ field#
                 }
 
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
             }
 
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
                 ^functionWithLazyBody String(42)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt
index 27ffa0f2d02..47f42eb5a3e 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt
@@ -1,377 +1,377 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
+        @Target[Unresolved](AnnotationTarget#.CLASS#) @Anno[Unresolved](String(string)) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
 
         }
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt
index b1e63031f54..ad957d01dda 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt
@@ -1,11 +1,11 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -28,12 +28,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -42,12 +42,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -56,12 +56,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -70,12 +70,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -84,12 +84,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -98,12 +98,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -112,12 +112,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -126,12 +126,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -140,12 +140,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -154,12 +154,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -168,12 +168,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -182,12 +182,12 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe<T, K>| {
+        public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe<T, K>| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt
index cc4c0d95827..b2689e1ed46 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt
@@ -1,18 +1,18 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -20,19 +20,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -40,19 +40,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -60,19 +60,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -80,19 +80,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -100,19 +100,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -120,19 +120,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -140,19 +140,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -160,19 +160,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -180,19 +180,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -200,19 +200,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -220,19 +220,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -240,19 +240,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
@@ -260,19 +260,19 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
+        @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/Int| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Value] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
index de063a01a03..e0fd734c171 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
index a1c02d21e6c..78d7fc28863 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
index 661ebad248c..b927cf936dc 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
index 409699e8308..c2ff16152f7 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt
index a195cddc4e3..6933ac30295 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt
@@ -1,35 +1,35 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -37,36 +37,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -74,36 +74,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -111,36 +111,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -148,36 +148,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -185,36 +185,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -222,36 +222,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -259,36 +259,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -296,36 +296,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -333,36 +333,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -370,36 +370,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -407,36 +407,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -444,36 +444,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -481,36 +481,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt
index 07dc5e0ace2..4dfd03002e2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt
@@ -1,30 +1,30 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -35,31 +35,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -70,31 +70,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -105,31 +105,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -140,31 +140,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -175,31 +175,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -210,31 +210,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -245,31 +245,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -280,31 +280,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -315,31 +315,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -350,31 +350,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -385,31 +385,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -420,31 +420,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -455,31 +455,31 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<AnotherTopLevelClass>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
index cf8949a71af..28bdb7cc7b2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
@@ -1,27 +1,27 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -30,28 +30,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -60,28 +60,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -90,28 +90,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -120,28 +120,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -150,28 +150,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -180,28 +180,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -210,28 +210,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -240,28 +240,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -270,28 +270,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -300,28 +300,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -330,28 +330,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -360,28 +360,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
@@ -390,28 +390,28 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
+        public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
 
-            public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    super<R|kotlin/Any|>()
+            public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] val originalExpressions: R|A|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|A|
+                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
 
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
index 48ab91e4c56..aea6fdd6db1 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -24,20 +24,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -48,20 +48,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -72,20 +72,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -96,20 +96,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -120,20 +120,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -144,20 +144,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -168,20 +168,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -192,20 +192,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -216,20 +216,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -240,20 +240,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,20 +264,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -288,20 +288,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -312,20 +312,20 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
+            @Target[Unresolved](AnnotationTarget#.TYPE#) local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/two/B| {
                     super<R|kotlin/Any|>()
                 }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
index 788ee8afce1..0b786faa91a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
@@ -1,377 +1,377 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
index 70efe6b9d9e..135e9c99a15 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
@@ -1,377 +1,377 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:Deprecated[Unresolved](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](String(param)) i: Int, [ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(parameter)) @Anno[Unresolved](String(parameter)) b: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](message = String(property)) @PROPERTY:R|Anno|[Types](s = String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](message = String(field)) @FIELD:R|Anno|[Types](s = String(field)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            @PROPERTY:Deprecated[Unresolved](String(property)) @PROPERTY:Anno[Unresolved](String(property)) field:@FIELD:Deprecated[Unresolved](String(field)) @FIELD:Anno[Unresolved](String(field)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
index d805ac4f5cc..bfb88c7c951 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
@@ -1,279 +1,279 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(function)) @R|Anno|[Types](s = String(function)) public final [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @R|kotlin/Deprecated|[Types](message = String(a)) @R|Anno|[Types](s = String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @Deprecated[Unresolved](String(function)) @Anno[Unresolved](String(function)) public? final? [ResolvedTo(RAW_FIR)] fun fooo([ResolvedTo(RAW_FIR)] @Deprecated[Unresolved](String(a)) @Anno[Unresolved](String(a)) a: Int): R|kotlin/Unit| {
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
index c0d81847616..7a178cd36c5 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
@@ -1,349 +1,349 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](message = String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/String|by R|kotlin/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-            ^ String(42)
+        field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](String(delegate)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            String(42)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/String| {
-                ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(Null(null), ::R|/memberProperty|)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
index 518ba5699d9..b9f0d2f4169 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
@@ -1,349 +1,349 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(property)) @R|Anno|[Types](s = String(property)) public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](message = String(getter)) @R|Anno|[Types](s = String(getter)) public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/memberProperty|
+        @Deprecated[Unresolved](String(property)) @Anno[Unresolved](String(property)) public? final? [ResolvedTo(RAW_FIR)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @Deprecated[Unresolved](String(getter)) @Anno[Unresolved](String(getter)) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](message = String(setter)) @R|Anno|[Types](s = String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](message = String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](s = String(setparam)) public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/memberProperty| = R|<local>/value|
+            @PROPERTY_SETTER:Deprecated[Unresolved](String(setter)) @Anno[Unresolved](String(setter)) @SETTER_PARAMETER:Deprecated[Unresolved](String(setparam)) @SETTER_PARAMETER:Anno[Unresolved](String(setparam)) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
+                field# = value#
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt
index 256f365d723..f622dc2b5d2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt
@@ -1,28 +1,28 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -34,29 +34,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -68,29 +68,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -102,29 +102,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -136,29 +136,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -170,29 +170,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -204,29 +204,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -238,29 +238,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -272,29 +272,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -306,29 +306,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -340,29 +340,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -374,29 +374,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -408,29 +408,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
@@ -442,29 +442,29 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class A : <ERROR TYPE REF: Symbol not found for B> {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-                    super<<ERROR TYPE REF: Symbol not found for B>>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class A : B {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
+                    super<B>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class B : R|one/NonLocalInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-                    super<R|kotlin/Any|>()
+            local final? [ResolvedTo(RAW_FIR)] class B : NonLocalInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
+                    super<<implicit>>()
                 }
 
-                local final inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : R|one/A| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
-                        super<R|one/A|>()
+                local final? inner [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] class C : A {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] one/B.constructor(): R|one/B.C| {
+                        super<A>()
                     }
 
                 }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt
index 25c642d7b52..f3cf5b392a0 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt
@@ -1,128 +1,128 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -132,129 +132,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -264,129 +264,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -396,129 +396,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -528,129 +528,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -660,129 +660,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -792,129 +792,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -924,129 +924,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -1056,129 +1056,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -1188,129 +1188,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -1320,129 +1320,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -1452,129 +1452,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -1584,129 +1584,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
@@ -1716,129 +1716,129 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface C : R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface D : R|C|, R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
         }
 
-        public final [ResolvedTo(STATUS)] class E : R|B|, R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=E] constructor(): R|E| {
-                super<R|A|>()
+        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
+                super<A>()
             }
 
         }
 
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
+        public? sealed [ResolvedTo(RAW_FIR)] class P : R|kotlin/Any| {
+            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] constructor(): R|P| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] object H : R|P| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] object H : P {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] class J : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class J : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
+                    super<P>()
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] object T : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=T] constructor(): R|P.T| {
+            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
+                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] object V : R|P| {
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] object V : P {
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
+                        super<P>()
                     }
 
                 }
 
-                public final [ResolvedTo(STATUS)] class M : R|P| {
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        super<R|P|>()
+                public? final? [ResolvedTo(RAW_FIR)] class M : P {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
+                        super<P>()
                     }
 
                 }
 
             }
 
-            public final [ResolvedTo(STATUS)] val p: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val p: P = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): P
 
-            public final [ResolvedTo(STATUS)] val r: R|P| = object : R|P| {
+            public? final? [ResolvedTo(RAW_FIR)] val r: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
 
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=P] get(): <implicit>
 
         }
 
-        public final [ResolvedTo(STATUS)] class K : R|P| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=K] constructor(): R|K| {
-                super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] class K : P {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
+                super<P>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] object B : R|kotlin/Any| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    super<R|P|>()
+            public? final? [ResolvedTo(RAW_FIR)] class I : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=I] constructor(): R|B.I| {
+                    super<P>()
                 }
 
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class L : R|P| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
-                    super<R|P|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class L : P {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=L] constructor(): R|L| {
+                    super<P>()
                 }
 
             }
 
-            [ResolvedTo(RAW_FIR)] lval a: R|<anonymous>| = object : R|P| {
+            [ResolvedTo(RAW_FIR)] lval a: <implicit> = object : P {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                    super<R|P|>()
+                    super<P>()
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt
index 1ebe72229ae..eb5b9a49893 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt
@@ -1,363 +1,363 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt
index 864d21da563..3d13f909310 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt
@@ -1,363 +1,363 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
+        public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component1, IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Int
 
-            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: R|kotlin/Boolean| = R|<local>/b|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/DataClass.component2, IsFromPrimaryConstructor=true] val b: Boolean = R|<local>/b|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] get(): Boolean
 
-            public final operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component1(): Int
 
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
+            public? final operator [ResolvedTo(RAW_FIR)] fun component2(): Boolean
 
-            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(STATUS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
+            public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] i: Int = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(RAW_FIR)] b: Boolean = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt
index ae47c9f03c1..3678bb2c420 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt
@@ -1,29 +1,29 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -31,30 +31,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -62,30 +62,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -93,30 +93,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -124,30 +124,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -155,30 +155,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -186,30 +186,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -217,30 +217,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -248,30 +248,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -279,30 +279,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -310,30 +310,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -341,30 +341,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -372,30 +372,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
@@ -403,30 +403,30 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Boo : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
+        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
 
         }
 
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
+                super<<implicit>>()
             }
 
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|one/Foo| = R|<local>/prop|
+            private final [ResolvedTo(RAW_FIR)] field $$delegate_0: Foo = prop#
 
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun baz([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt
index b418609a94a..c671f0baf2a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt
@@ -1,335 +1,335 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt
index d504fd11a76..d181ae26270 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt
@@ -1,517 +1,517 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class Foo : R|kotlin/Enum<Foo>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor(): R|Foo| {
                 super<R|kotlin/Enum<Foo>|>()
             }
 
-            @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+            @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
                 private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                     super<R|Foo|>()
                 }
 
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Foo| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Foo| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Foo>|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt
index fc52953696a..4f67d6dfc4b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt
@@ -1,335 +1,335 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt
index c7b71b54c43..6d603609a4b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt
@@ -1,335 +1,335 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
                 super<R|kotlin/Enum<one/MyEnum>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun values(): R|kotlin/Array<one/MyEnum>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|one/MyEnum| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt
index 6b1373aa26e..e6ed130f9e2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt
@@ -1,15 +1,15 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -17,16 +17,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -34,16 +34,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -51,16 +51,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -68,16 +68,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -85,16 +85,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -102,16 +102,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -119,16 +119,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -136,16 +136,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -153,16 +153,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -170,16 +170,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -187,16 +187,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -204,16 +204,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -221,16 +221,16 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt
index 994ccda0bef..93340f1da6e 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt
@@ -1,49 +1,49 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -53,50 +53,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -106,50 +106,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -159,50 +159,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -212,50 +212,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -265,50 +265,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -318,50 +318,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -371,50 +371,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -424,50 +424,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -477,50 +477,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -530,50 +530,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -583,50 +583,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -636,50 +636,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
@@ -689,50 +689,50 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local open [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local open [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] class SecondLocalClass : R|LocalClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
-                    super<R|LocalClass|>()
+            local final? [ResolvedTo(RAW_FIR)] class SecondLocalClass : LocalClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SecondLocalClass] constructor(): R|SecondLocalClass| {
+                    super<LocalClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt
index a629fd97705..e5f2a714c55 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt
@@ -1,195 +1,195 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface I : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: R|I|): R|kotlin/Unit| {
-            ^resolveMe Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): <implicit> {
+            ^resolveMe Unit#
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt
index a7acd3d4a95..dfceb4b7824 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt
@@ -1,349 +1,349 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt
index e8abfdf09f3..7d50f1e4384 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt
@@ -125,11 +125,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(TYPES)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -150,11 +150,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(STATUS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -175,11 +175,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -200,11 +200,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -225,11 +225,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(CONTRACTS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -275,11 +275,11 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
                 kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
                     callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
@@ -300,50 +300,50 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
+        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             >
          {
              {
-                Q|kotlin/contracts|.R|kotlin/contracts/contract|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<kotlin/contracts/ContractBuilder, kotlin/Unit>] contract@fun R|kotlin/contracts/ContractBuilder|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|special/anonymous|.R|kotlin/contracts/ContractBuilder.callsInPlace|<R|kotlin/Unit|>(R|<local>/block|, Q|kotlin/contracts/InvocationKind|.R|kotlin/contracts/InvocationKind.EXACTLY_ONCE|)
+                kotlin#.contracts#.contract#(<L> = [ResolvedTo(RAW_FIR)] contract@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    callsInPlace#(block#, InvocationKind#.EXACTLY_ONCE#)
                 }
                 )
             }
 
-            R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
+            block#()
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt
index 4587901b494..b97e1e6e9c1 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt
@@ -1,307 +1,307 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Foo<kotlin/String>?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? {
             ^bar Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>?| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: <implicit> = bar#()
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt
index 06cd02de4ed..fe62f17ce97 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt
@@ -1,153 +1,153 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/Int|): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): <implicit> {
             ^foo String(boo)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
index 36fef9c50b2..cffa58173ce 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
@@ -1,405 +1,405 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class Bar : R|Foo<kotlin/String>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                super<R|Foo<kotlin/String>|>()
+        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun bar(): R|Bar| {
-            ^bar R|/Bar.Bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+            ^bar Bar#()
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            [ResolvedTo(RAW_FIR)] lval x: R|Foo<kotlin/String>| = R|/bar|()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            [ResolvedTo(RAW_FIR)] lval x: Foo<String> = bar#()
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt
index 35c59a866af..a5d847d8c26 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt
@@ -1,139 +1,139 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| {
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
index de063a01a03..e0fd734c171 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
index a1c02d21e6c..78d7fc28863 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
index 409699e8308..c2ff16152f7 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,57 +21,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -81,20 +81,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -102,57 +102,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -162,20 +162,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -183,57 +183,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -243,20 +243,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -264,57 +264,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -324,20 +324,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -345,57 +345,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -405,20 +405,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -426,57 +426,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -486,20 +486,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -507,57 +507,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -567,20 +567,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -588,57 +588,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -648,20 +648,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -669,57 +669,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -729,20 +729,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -750,57 +750,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -810,20 +810,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -831,57 +831,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -891,20 +891,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -912,57 +912,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -972,20 +972,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -993,57 +993,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1053,20 +1053,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1074,57 +1074,57 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt
index a195cddc4e3..6933ac30295 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt
@@ -1,35 +1,35 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -37,36 +37,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -74,36 +74,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -111,36 +111,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -148,36 +148,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -185,36 +185,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -222,36 +222,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -259,36 +259,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -296,36 +296,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -333,36 +333,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -370,36 +370,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -407,36 +407,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -444,36 +444,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
@@ -481,36 +481,36 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt
index 713aca0bccc..38e9d3f1aa8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt
@@ -1,27 +1,27 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -29,28 +29,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -58,28 +58,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -87,28 +87,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -116,28 +116,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -145,28 +145,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -174,28 +174,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -203,28 +203,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -232,28 +232,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -261,28 +261,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -290,28 +290,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -319,28 +319,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -348,28 +348,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
@@ -377,28 +377,28 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Arg : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
+        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract fun [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] a: R|foo/Arg|): R|foo/Arg|
+        public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: R|foo/Foo|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|foo/testMe|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=foo/Foo] testMe@fun <anonymous>([ResolvedTo(RAW_FIR)] b: R|foo/Arg|): R|foo/Arg| <inline=NoInline>  {
-                ^ R|<local>/b|
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            testMe#(<L> = [ResolvedTo(RAW_FIR)] testMe@fun <implicit>.<anonymous>([ResolvedTo(RAW_FIR)] b: <implicit>): <implicit> <inline=Unknown>  {
+                b#
             }
             )
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt
index ce3e96f3c30..2d4c08468e6 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt
@@ -1,46 +1,46 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -48,47 +48,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -96,47 +96,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -144,47 +144,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -192,47 +192,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -240,47 +240,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -288,47 +288,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -336,47 +336,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -384,47 +384,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -432,47 +432,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -480,47 +480,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -528,47 +528,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -576,47 +576,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
@@ -624,47 +624,47 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|T| = R|<local>/value|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] get(): R|T|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: T = R|<local>/value|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] get(): T
 
-            public final operator [ResolvedTo(STATUS)] fun getValue([ResolvedTo(STATUS)] thisRef: R|kotlin/Any?|, [ResolvedTo(STATUS)] property: R|kotlin/reflect/KProperty<*>|): R|T| {
-                ^getValue this@R|/LazyDelegate|.R|/LazyDelegate.value|
+            public? final? operator [ResolvedTo(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T {
+                ^getValue value#
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: R|() -> T|): R|LazyDelegate<T>| {
-            ^lazy R|SubstitutionOverride</LazyDelegate.LazyDelegate>|<R|T|>(R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> {
+            ^lazy LazyDelegate#(block#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun getAny(): R|kotlin/Any?| {
+        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? {
             ^getAny Null(null)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q {
             ^materialize Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
+        public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by R|/lazy|<R|kotlin/String|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/String| <inline=NoInline>  {
-                ^ R|/materialize|<R|kotlin/String|>()
+            public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby lazy#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                materialize#()
             }
             )
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride</LazyDelegate.getValue: R|Stub (chain inference): TypeVariable(_T)|>|(this@R|/Test|, ::R|/Test.resolveMe|)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
+                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
                 }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
index 8a0484f8d8b..958d60a5b71 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
@@ -1,37 +1,37 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -41,38 +41,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -82,38 +82,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -123,38 +123,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -164,38 +164,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -205,38 +205,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -246,38 +246,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -287,38 +287,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -328,38 +328,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -369,38 +369,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -410,38 +410,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -451,38 +451,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -492,38 +492,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
@@ -533,38 +533,38 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): R|T| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T {
             ^magic Null(null)!!
         }
 
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
+        public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> foo(): R|() -> Q.C<F, E, F>| {
-                ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(STATUS)] E, [ResolvedTo(STATUS)] F> : R|kotlin/Any| {
-                        public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> foo(): <implicit> {
+                ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(RAW_FIR)] E, [ResolvedTo(RAW_FIR)] F> : R|kotlin/Any| {
+                        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
 
-                        public final [ResolvedTo(RAW_FIR)] val e: R|E| = R|/magic|<R|E|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|E|
+                        public? final? [ResolvedTo(RAW_FIR)] val e: E = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): E
 
-                        public final [ResolvedTo(RAW_FIR)] val f: R|F| = R|/magic|<R|F|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|F|
+                        public? final? [ResolvedTo(RAW_FIR)] val f: F = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): F
 
-                        public final [ResolvedTo(RAW_FIR)] val g: R|G| = R|/magic|<R|G|>()
-                            public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): R|G|
+                        public? final? [ResolvedTo(RAW_FIR)] val g: G = magic#()
+                            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] get(): G
 
                     }
 
-                    ^ R|SubstitutionOverride<<local>/Q.C.C>|<R|F|>()
+                    C#<F>()
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt
index 7f18ce3fe32..333de81ae74 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt
@@ -1,23 +1,23 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -26,24 +26,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -52,24 +52,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -78,24 +78,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -104,24 +104,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -130,24 +130,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -156,24 +156,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -182,24 +182,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -208,24 +208,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -234,24 +234,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -260,24 +260,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -286,24 +286,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -312,24 +312,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -338,24 +338,24 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.s] s: String): R|one/Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        @Anno[Unresolved]([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
         }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+        .invoke#()) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
index 7c2868b2ebf..f8e2de49945 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
@@ -1,20 +1,20 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -26,21 +26,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -52,21 +52,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -78,21 +78,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -104,21 +104,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -130,21 +130,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -156,21 +156,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -182,21 +182,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -208,21 +208,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -234,21 +234,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -260,21 +260,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -286,21 +286,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -312,21 +312,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -338,21 +338,21 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: ( () -> Unit )): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
index 99a4acf3435..686eeb2745a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
@@ -1,26 +1,26 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -28,27 +28,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -56,27 +56,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -84,27 +84,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -112,27 +112,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -140,27 +140,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -168,27 +168,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -196,27 +196,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -224,27 +224,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -252,27 +252,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -280,27 +280,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -308,27 +308,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -336,27 +336,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -364,27 +364,27 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] fun str(): R|kotlin/String| {
-                        ^str Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+                    local final? [ResolvedTo(RAW_FIR)] fun str(): String {
+                        ^str IntegerLiteral(42)
                     }
 
-                    ^ R|<local>/str|()
+                    str#()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt
index 0091b0f135c..a34bfa5ca06 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt
@@ -1,601 +1,601 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt
index 791dd8a6183..65f80e65dc3 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt
@@ -1,22 +1,22 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -24,23 +24,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -48,23 +48,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -72,23 +72,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -96,23 +96,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -120,23 +120,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -144,23 +144,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -168,23 +168,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -192,23 +192,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -216,23 +216,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -240,23 +240,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -264,23 +264,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -288,23 +288,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
@@ -312,23 +312,23 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] s: String): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): String <inline=Unknown>  {
                     ^ String()
                 }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
+                .invoke#()))
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
index ace2d396170..2ccf12ecd66 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
@@ -1,29 +1,29 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -35,30 +35,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -70,30 +70,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -105,30 +105,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -140,30 +140,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -175,30 +175,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -210,30 +210,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -245,30 +245,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -280,30 +280,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -315,30 +315,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -350,30 +350,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -385,30 +385,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -420,30 +420,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -455,30 +455,30 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt
index 55c53fb348a..33438956f73 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt
@@ -1,43 +1,43 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -50,44 +50,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -100,44 +100,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -150,44 +150,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -200,44 +200,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -250,44 +250,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -300,44 +300,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -350,44 +350,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -400,44 +400,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -450,44 +450,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -500,44 +500,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -550,44 +550,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -600,44 +600,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
@@ -650,44 +650,44 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
+        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
                 super<R|kotlin/Any|>()
             }
 
-            public open [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
-            public open [ResolvedTo(STATUS)] fun boo([ResolvedTo(STATUS)] b: R|kotlin/String|): R|kotlin/Unit| {
+            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| {
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                super<R|TopLevelClass|>()
+        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
+                super<TopLevelClass>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class LocalClass : R|AnotherTopLevelClass| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
-                    super<R|AnotherTopLevelClass|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class LocalClass : AnotherTopLevelClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|LocalClass| {
+                    super<AnotherTopLevelClass>()
                 }
 
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
-                local final [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
+                local final? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] class NestedLocalClass : R|kotlin/Any| {
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedLocalClass] constructor(): R|LocalClass.NestedLocalClass| {
                         super<R|kotlin/Any|>()
                     }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt
index 0d94dcecb49..fb7f7b83894 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt
@@ -1,29 +1,29 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -35,30 +35,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -70,30 +70,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -105,30 +105,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -140,30 +140,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -175,30 +175,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -210,30 +210,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -245,30 +245,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -280,30 +280,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -315,30 +315,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -350,30 +350,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -385,30 +385,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -420,30 +420,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
@@ -455,30 +455,30 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Interface : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit|
 
         }
 
-        public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
+        public? open [ResolvedTo(RAW_FIR)] class ClassWithParameter : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(RAW_FIR)] i: Interface): R|one/ClassWithParameter| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
+        public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : ClassWithParameter {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
+                super<ClassWithParameter>(object : Interface {
                     private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
-                        super<R|kotlin/Any|>()
+                        super<<implicit>>()
                     }
 
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
+                    public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: String): R|kotlin/Unit| {
                     }
 
                 }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
index a5e84061696..fc3ef162949 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
@@ -1,47 +1,47 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -49,48 +49,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -98,48 +98,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -147,48 +147,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -196,48 +196,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -245,48 +245,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -294,48 +294,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -343,48 +343,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -392,48 +392,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -441,48 +441,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -490,48 +490,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -539,48 +539,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -588,48 +588,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
@@ -637,48 +637,48 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
-            @R|kotlin/Deprecated|[Types](message = String(FirstClass)) @R|Anno|[Types](s = String(FirstClass)) local final [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @R|Anno|[Types](s = String(constructorProperty)) a: R|kotlin/Int|): R|FirstClass| {
+        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(FirstClass)) @Anno[Unresolved](String(FirstClass)) local final? [ResolvedTo(RAW_FIR)] class FirstClass : R|kotlin/Any| {
+                @Deprecated[Unresolved](String(constructor)) @Anno[Unresolved](String(constructor)) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/a] @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) a: Int): R|FirstClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(constructorProperty)) public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(constructorProperty)) @Anno[Unresolved](String(constructorProperty)) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
 
-                @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
+                @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
-                @R|kotlin/Deprecated|[Types](message = String(memberProperty)) @R|Anno|[Types](s = String(memberProperty)) public final [ResolvedTo(RAW_FIR)] val memberProperty: R|kotlin/Int| = Int(32)
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
+                @Deprecated[Unresolved](String(memberProperty)) @Anno[Unresolved](String(memberProperty)) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = IntegerLiteral(32)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
 
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(anotherFunction)) @R|Anno|[Types](s = String(anotherFunction)) local final [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(anotherFunction)) @Anno[Unresolved](String(anotherFunction)) local final? [ResolvedTo(RAW_FIR)] fun anotherFunction(): R|kotlin/Unit| {
             }
 
         }
 
-        @R|kotlin/Deprecated|[Types](message = String(AnotherClass)) @R|Anno|[Types](s = String(AnotherClass)) public final [ResolvedTo(STATUS)] class AnotherClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
+        @Deprecated[Unresolved](String(AnotherClass)) @Anno[Unresolved](String(AnotherClass)) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
                 super<R|kotlin/Any|>()
             }
 
-            @R|kotlin/Deprecated|[Types](message = String(memberFunction)) @R|Anno|[Types](s = String(memberFunction)) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| {
+            @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](String(memberFunction)) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt
index cc791297169..98aa3fa6932 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt
@@ -1,349 +1,349 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
+        public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass<T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] class NestedClass<[ResolvedTo(STATUS)] T2> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(STATUS)] T2>(): R|OuterClass.NestedClass<T2>| {
+            public? final? [ResolvedTo(RAW_FIR)] class NestedClass<[ResolvedTo(RAW_FIR)] T2> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(RAW_FIR)] T2>(): R|OuterClass.NestedClass<T2>| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = R|OuterClass.NestedClass<T>|
+            public? final [ResolvedTo(RAW_FIR)] typealias NestedType<[ResolvedTo(RAW_FIR)] T> = NestedClass<T>
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = R|OuterClass.NestedType<T2>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ON3<[ResolvedTo(RAW_FIR)] T2> = OuterClass.NestedType<T2>
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt
index a5b47ad7d30..e2e3984e51f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt
@@ -1,18 +1,18 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -20,19 +20,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -40,19 +40,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -60,19 +60,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -80,19 +80,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -100,19 +100,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -120,19 +120,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -140,19 +140,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -160,19 +160,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -180,19 +180,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -200,19 +200,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -220,19 +220,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -240,19 +240,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
@@ -260,19 +260,19 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = Int(2)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                    ^ Q|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] get(): Int
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                    ^ Unit#
                 }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt
index 95cfdf9cb5a..e48549de30f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt
@@ -1,181 +1,181 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var x: R|kotlin/Int| = Int(2)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Q|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(2)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| {
+                ^ Unit#
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt
index db98fc5b0e1..71827e4469d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt
@@ -1,15 +1,15 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -18,16 +18,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -36,16 +36,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -54,16 +54,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -72,16 +72,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -90,16 +90,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -108,16 +108,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -126,16 +126,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -144,16 +144,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -162,16 +162,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -180,16 +180,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -198,16 +198,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -216,16 +216,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -234,16 +234,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = Int(1), [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = IntegerLiteral(1), [ResolvedTo(RAW_FIR)] c: Long): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt
index f1ad7b36401..da1317da8cd 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt
@@ -1,18 +1,18 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -21,19 +21,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -42,19 +42,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -63,19 +63,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -84,19 +84,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -105,19 +105,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -126,19 +126,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -147,19 +147,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -168,19 +168,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -189,19 +189,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -210,19 +210,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -231,19 +231,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -252,19 +252,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
@@ -273,19 +273,19 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42)): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt
index d5b1fc85dc3..0386d4b6c37 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt
@@ -1,15 +1,15 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -17,16 +17,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -34,16 +34,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -51,16 +51,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -68,16 +68,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -85,16 +85,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -102,16 +102,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -119,16 +119,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -136,16 +136,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -153,16 +153,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -170,16 +170,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -187,16 +187,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -204,16 +204,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
@@ -221,16 +221,16 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
+        public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
index 970050288c2..6b70db7bc1a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,60 +21,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -84,20 +84,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -105,60 +105,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -168,20 +168,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -189,60 +189,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -252,20 +252,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -273,60 +273,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -336,20 +336,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -357,60 +357,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -420,20 +420,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -441,60 +441,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -504,20 +504,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -525,60 +525,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -588,20 +588,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -609,60 +609,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -672,20 +672,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -693,60 +693,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -756,20 +756,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -777,60 +777,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -840,20 +840,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -861,60 +861,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -924,20 +924,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -945,60 +945,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1008,20 +1008,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1029,60 +1029,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1092,20 +1092,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1113,60 +1113,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(true)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(true)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
index 94d8db03c60..3d972092dbc 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,60 +21,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -84,20 +84,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -105,60 +105,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -168,20 +168,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -189,60 +189,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -252,20 +252,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -273,60 +273,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -336,20 +336,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -357,60 +357,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -420,20 +420,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -441,60 +441,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -504,20 +504,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -525,60 +525,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -588,20 +588,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -609,60 +609,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -672,20 +672,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -693,60 +693,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -756,20 +756,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -777,60 +777,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -840,20 +840,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -861,60 +861,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -924,20 +924,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -945,60 +945,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1008,20 +1008,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1029,60 +1029,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1092,20 +1092,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1113,60 +1113,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                private final [ResolvedTo(STATUS)] val myProp: R|kotlin/Int| = Int(1)
-                    private [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] get(): R|kotlin/Int|
+                private final? [ResolvedTo(RAW_FIR)] val myProp: <implicit> = IntegerLiteral(1)
+                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
index 9adcbbb2c7f..29e1c2a3b83 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,64 +21,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -87,20 +87,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -108,64 +108,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -174,20 +174,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -195,64 +195,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -261,20 +261,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -282,64 +282,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -348,20 +348,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -369,64 +369,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -435,20 +435,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -456,64 +456,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -522,20 +522,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -543,64 +543,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -609,20 +609,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -630,64 +630,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -696,20 +696,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -717,64 +717,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -783,20 +783,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -804,64 +804,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -870,20 +870,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -891,64 +891,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -957,20 +957,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -978,64 +978,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -1044,20 +1044,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1065,64 +1065,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
@@ -1131,20 +1131,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1152,64 +1152,64 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
-                public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = String()
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/String|
+                public? final? [ResolvedTo(RAW_FIR)] val st: <implicit> = String()
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
-                public open override [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean| = Boolean(false)
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] get(): R|kotlin/Boolean|
+                public? open? override [ResolvedTo(RAW_FIR)] val isBoo: <implicit> = Boolean(false)
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
 
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
index cd10f9743c4..0e91095044d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,60 +21,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -84,20 +84,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -105,60 +105,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -168,20 +168,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -189,60 +189,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -252,20 +252,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -273,60 +273,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -336,20 +336,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -357,60 +357,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -420,20 +420,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -441,60 +441,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -504,20 +504,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -525,60 +525,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -588,20 +588,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -609,60 +609,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -672,20 +672,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -693,60 +693,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -756,20 +756,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -777,60 +777,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -840,20 +840,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -861,60 +861,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -924,20 +924,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -945,60 +945,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1008,20 +1008,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1029,60 +1029,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
@@ -1092,20 +1092,20 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
-            public final [ResolvedTo(STATUS)] class ClassFromInterface : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
+            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -1113,60 +1113,60 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo3 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo3] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class OuterClass : R|Foo1| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class OuterClass : Foo1 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
+                super<<implicit>>()
             }
 
-            public final [ResolvedTo(STATUS)] val st: R|kotlin/String| = Int(1)
-                public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val st: String = IntegerLiteral(1)
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] get(): String
 
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
+            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    super<R|kotlin/Any|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
+                    super<<implicit>>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
                 }
 
             }
 
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    super<R|OuterClass.NestedClass|>()
+            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
+                    super<NestedClass>()
                 }
 
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| {
+                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| {
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt
index 7570a005d11..c3dd81c752c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt
@@ -1,559 +1,559 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
+            public? final? [ResolvedTo(RAW_FIR)] val str: String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
 
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
+            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
 
         }
 
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                super<R|kotlin/Any|>()
+        public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
+                super<<implicit>>()
             }
 
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| {
+            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
             }
 
-            public open override [ResolvedTo(STATUS)] val str: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] get(): R|kotlin/String|
+            public? open? override [ResolvedTo(RAW_FIR)] val str: <implicit> = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] get(): <implicit>
 
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
index 0ecb0affed7..d9322104b8f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
@@ -1,167 +1,167 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
index 10c7a18db2f..70ad5af429a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
@@ -1,167 +1,167 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
index 29ae300c2d7..2f33bd6bc4a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
@@ -1,167 +1,167 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val prop: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
+                ^ IntegerLiteral(42)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt
index f489fbf5122..833dade9629 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt
@@ -1,167 +1,167 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] var prop: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] var prop: <implicit> = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit| {
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt
index 8ce7f6a085a..feca4cc5b07 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt
@@ -1,167 +1,167 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(RAW_FIR)] get(): R|K| {
-                ^ R|kotlin/TODO|()
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K
+            public? [ResolvedTo(RAW_FIR)] get(): K {
+                ^ TODO#()
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt
index f06d11800e7..9ee352acdca 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt
@@ -1,321 +1,321 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetterAndSetter|)
-            R|/withGetterAndSetter| = Int(123)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetterAndSetter#)
+            withGetterAndSetter# = IntegerLiteral(123)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ F|/withGetterAndSetter|
+        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = IntegerLiteral(42)
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ field#
             }
-            public [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
-                F|/withGetterAndSetter| = R|<local>/value|
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
+                field# = value#
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt
index 999cd5f5467..bdd9db6d7df 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt
@@ -1,265 +1,265 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/withGetter|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(withGetter#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val withGetter: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt
index 74971146dfb..d3eb68bd04f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt
@@ -1,195 +1,195 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            <Unresolved name: receive>#(R|/property|)
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(property#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val property: R|kotlin/Int| = Int(10)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val property: Int = IntegerLiteral(10)
+            public? [ResolvedTo(RAW_FIR)] get(): Int
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt
index 9fe32f63413..880b70a659c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt
@@ -1,17 +1,17 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -21,18 +21,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -42,18 +42,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -63,18 +63,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -84,18 +84,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -105,18 +105,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -126,18 +126,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -147,18 +147,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -168,18 +168,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -189,18 +189,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -210,18 +210,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -231,18 +231,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -252,18 +252,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -273,18 +273,18 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
-                super<R|kotlin/Any|>()
-            }
-
-        }
-
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                super<R|kotlin/Any|>()
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
index aea994c8651..b3258e8067d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
@@ -1,26 +1,26 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -30,27 +30,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -60,27 +60,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -90,27 +90,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -120,27 +120,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -150,27 +150,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -180,27 +180,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -210,27 +210,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -240,27 +240,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -270,27 +270,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -300,27 +300,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -330,27 +330,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -360,27 +360,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
@@ -390,27 +390,27 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface2 : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|one/two/UsedInterface2| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|one/two/UsedInterface| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
-                    super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : UsedInterface {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+                    super<<implicit>>()
                 }
 
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
index 0e55048e874..7fe7916bda2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
@@ -1,34 +1,34 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -37,35 +37,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -74,35 +74,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -111,35 +111,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -148,35 +148,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -185,35 +185,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -222,35 +222,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -259,35 +259,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -296,35 +296,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -333,35 +333,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -370,35 +370,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -407,35 +407,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -444,35 +444,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
@@ -481,35 +481,35 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: R|one/two/UsedClass|): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=<local>/u] u: UsedClass): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: R|one/two/UsedClass| = R|<local>/u|
-                    public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): R|one/two/UsedClass|
+                public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val u: UsedClass = R|<local>/u|
+                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] get(): UsedClass
 
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt
index fcf553a14eb..86d13bbd6ee 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt
@@ -1,35 +1,35 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -37,36 +37,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -74,36 +74,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -111,36 +111,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -148,36 +148,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -185,36 +185,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -222,36 +222,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -259,36 +259,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -296,36 +296,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -333,36 +333,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -370,36 +370,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -407,36 +407,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -444,36 +444,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
@@ -481,36 +481,36 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class UnusedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public abstract [ResolvedTo(STATUS)] interface UsedInterface : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(STATUS)] class UsedClass : R|one/two/UsedInterface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                super<R|kotlin/Any|>()
+        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
+                super<<implicit>>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            local final [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Local] constructor(): R|one/two/Local| {
                     super<R|kotlin/Any|>()
                 }
 
             }
 
-            local final [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: R|one/two/UsedClass|, [ResolvedTo(RAW_FIR)] local: R|one/two/Local|): R|kotlin/Unit| {
+            local final? [ResolvedTo(RAW_FIR)] fun localFunction([ResolvedTo(RAW_FIR)] usedClass: UsedClass, [ResolvedTo(RAW_FIR)] local: Local): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/script.txt
index bc94a538942..50be863d986 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/script.txt
@@ -380,7 +380,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(TYPES)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
@@ -389,11 +389,11 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
@@ -416,21 +416,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -451,31 +451,31 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
         )
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(STATUS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
@@ -492,21 +492,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -521,37 +521,37 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
@@ -568,21 +568,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -597,37 +597,37 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
@@ -644,21 +644,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -673,37 +673,37 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(CONTRACTS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
@@ -720,21 +720,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -749,37 +749,37 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
@@ -796,21 +796,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -825,37 +825,37 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: R|kotlin/String| = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
@@ -872,21 +872,21 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|kotlin/annotation/Target|[Types](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): <implicit> {
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
             ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(123)
             local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
@@ -901,163 +901,163 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
             version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
         builder#.version# = String()
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class En : R|kotlin/Enum<En>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=En] constructor(): R|En| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] enum entry Entry: R|En|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] fun values(): R|kotlin/Array<En>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] enum entry Entry: R|En|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] fun values(): R|kotlin/Array<En>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|En| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|En| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] val entries: R|kotlin/enums/EnumEntries<En>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<En>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] val entries: R|kotlin/enums/EnumEntries<En>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<En>|
 
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|)) @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
+        builder#.version# = String()
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(STATUS)] enum class En : R|kotlin/Enum<En>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=En] constructor(): R|En| {
+        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
+            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] enum entry Entry: R|En|
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] fun values(): R|kotlin/Array<En>| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] enum entry Entry: R|En|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] fun values(): R|kotlin/Array<En>| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|En| {
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|En| {
             }
 
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] val entries: R|kotlin/enums/EnumEntries<En>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<En>|
+            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] val entries: R|kotlin/enums/EnumEntries<En>|
+                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<En>|
 
         }
 
-        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|)) @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
+        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|En|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
 
         }
 
-        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        @Anno[Unresolved](En#.Entry#) builder#.execute#()
+        builder#.version# = String()
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt
index d19644813be..cd5f58bbf3b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt
@@ -1,7 +1,7 @@
 RAW_FIR:
 FILE: [ResolvedTo(RAW_FIR)] script2.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)]
+    SCRIPT: [ResolvedTo(RAW_FIR)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
@@ -50,7 +50,7 @@ FILE: [ResolvedTo(RAW_FIR)] script2.kts
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)]
+    SCRIPT: [ResolvedTo(RAW_FIR)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
@@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)]
+    SCRIPT: [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
@@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(COMPANION_GENERATION)]
+    SCRIPT: [ResolvedTo(COMPANION_GENERATION)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
@@ -197,7 +197,7 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(SUPER_TYPES)]
+    SCRIPT: [ResolvedTo(SUPER_TYPES)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
@@ -245,21 +245,21 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(TYPES)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public? [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
         public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
@@ -294,39 +294,39 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(STATUS)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(STATUS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
         consume#(x#.plus#(IntegerLiteral(1)))
         x#!!
         consume#(x#.plus#(IntegerLiteral(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -343,39 +343,39 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
         consume#(x#.plus#(IntegerLiteral(1)))
         x#!!
         consume#(x#.plus#(IntegerLiteral(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -392,39 +392,39 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
         consume#(x#.plus#(IntegerLiteral(1)))
         x#!!
         consume#(x#.plus#(IntegerLiteral(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -441,39 +441,39 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(CONTRACTS)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(CONTRACTS)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
         consume#(x#.plus#(IntegerLiteral(1)))
         x#!!
         consume#(x#.plus#(IntegerLiteral(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -490,39 +490,39 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
         consume#(x#.plus#(IntegerLiteral(1)))
         x#!!
         consume#(x#.plus#(IntegerLiteral(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -539,39 +539,39 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
             [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
             ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = IntegerLiteral(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
         consume#(x#.plus#(IntegerLiteral(1)))
         x#!!
         consume#(x#.plus#(IntegerLiteral(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
@@ -588,48 +588,48 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
-            [ResolvedTo(RAW_FIR)] lval fy: R|kotlin/Int| = R|<local>/p|!!
-            [ResolvedTo(RAW_FIR)] lval fz: R|kotlin/Int| = R|<local>/p|.R|kotlin/Int.plus|(Int(1))
-            ^f R|<local>/fz|
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
+            [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
+            [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
+            ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = Int(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: R|kotlin/Int| = R|/x|!!
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: R|kotlin/Int| = R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Int| {
-            ^foo R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+            ^foo x#.plus#(IntegerLiteral(1))
         }
 
-        R|/consume|(R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1)))
-        R|/x|!!
-        R|/consume|(R|/x|.R|kotlin/Int.plus|(Int(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: R|kotlin/Int| = R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        consume#(x#.plus#(IntegerLiteral(1)))
+        x#!!
+        consume#(x#.plus#(IntegerLiteral(1)))
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val cz: R|kotlin/Int| = R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] val cz: <implicit> = x#.plus#(IntegerLiteral(1))
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): <implicit>
 
-            public final [ResolvedTo(STATUS)] fun bar(): R|kotlin/Int| {
-                ^bar R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+                ^bar x#.plus#(IntegerLiteral(1))
             }
 
         }
@@ -637,48 +637,48 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: R|kotlin/Int?|): R|kotlin/Int| {
-            [ResolvedTo(RAW_FIR)] lval fy: R|kotlin/Int| = R|<local>/p|!!
-            [ResolvedTo(RAW_FIR)] lval fz: R|kotlin/Int| = R|<local>/p|.R|kotlin/Int.plus|(Int(1))
-            ^f R|<local>/fz|
+        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
+            [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
+            [ResolvedTo(RAW_FIR)] lval fz: <implicit> = p#.plus#(IntegerLiteral(1))
+            ^f fz#
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val x: R|kotlin/Int?| = Int(1)
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int?|
+        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
+            public? [ResolvedTo(RAW_FIR)] get(): Int?
 
-        public final [ResolvedTo(RAW_FIR)] val y: R|kotlin/Int| = R|/x|!!
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val z: R|kotlin/Int| = R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Int| {
-            ^foo R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
+        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
+            ^foo x#.plus#(IntegerLiteral(1))
         }
 
-        R|/consume|(R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1)))
-        R|/x|!!
-        R|/consume|(R|/x|.R|kotlin/Int.plus|(Int(1)))
-        public final [ResolvedTo(RAW_FIR)] val zz: R|kotlin/Int| = R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int|
+        consume#(x#.plus#(IntegerLiteral(1)))
+        x#!!
+        consume#(x#.plus#(IntegerLiteral(1)))
+        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] val cz: R|kotlin/Int| = R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] val cz: <implicit> = x#.plus#(IntegerLiteral(1))
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): <implicit>
 
-            public final [ResolvedTo(STATUS)] fun bar(): R|kotlin/Int| {
-                ^bar R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1))
+            public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> {
+                ^bar x#.plus#(IntegerLiteral(1))
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt
index e462eb18f83..d0a29146dc5 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt
@@ -1,405 +1,405 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = IntegerLiteral(42), [ResolvedTo(RAW_FIR)] c: String): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|kotlin/Int| = R|<local>/prop|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
+            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: Int = R|<local>/prop|
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): Int
 
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] str: R|kotlin/String|): R|A| {
-                this<R|A|>(R|<local>/str|.R|/myToInt|(), R|<local>/str|)
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] str: String): R|A| {
+                this<R|A|>(str#.myToInt#(), str#)
             }
 
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/String| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> {
                 ^foo String(str)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| {
-            ^myToInt Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int {
+            ^myToInt IntegerLiteral(42)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt
index 63a6b9410e8..7164a0aa110 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt
@@ -1,20 +1,20 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -22,21 +22,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -44,21 +44,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -66,21 +66,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -88,21 +88,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -110,21 +110,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -132,21 +132,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -154,21 +154,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -176,21 +176,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -198,21 +198,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -220,21 +220,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -242,21 +242,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -264,21 +264,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
@@ -286,21 +286,21 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/A.A|(Int(42)))
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(A#(IntegerLiteral(42)))
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|A|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
+        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| {
                 super<R|kotlin/Any|>()
-                [ResolvedTo(RAW_FIR)] lval a: R|kotlin/Int| = R|<local>/x|
+                [ResolvedTo(RAW_FIR)] lval a: <implicit> = x#
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt b/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt
index eff1b9f3072..c7964a61c9d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt
@@ -1,685 +1,685 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(123)
-            local final [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(123)
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            this@R|special/anonymous|.R|/Builder.execute|()
+            execute#()
         }
         )
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
+        builder#.execute#()
+        builder#.version# = String()
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt
index 19ad823e9b4..121c5064f7b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt
@@ -1,489 +1,489 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit|
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
 
-            public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| {
-                R|kotlin/io/println|(this@R|/Builder|.R|/Builder.version|)
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
+            ^build Builder#().apply#(action#)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val builder: R|Builder| = R|/build|(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|/Builder.version| = String(321)
+        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            version# = String(321)
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): R|Builder|
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Unit|
+        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
+            public [ResolvedTo(RAW_FIR)] get(): <implicit>
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt
index 876a94d7dc3..6ff6c5cbadb 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt
@@ -1,26 +1,26 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -28,27 +28,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -56,27 +56,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -84,27 +84,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -112,27 +112,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -140,27 +140,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -168,27 +168,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -196,27 +196,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -224,27 +224,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -252,27 +252,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -280,27 +280,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -308,27 +308,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -336,27 +336,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
@@ -364,27 +364,27 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
+        public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class B : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
+                super<A>()
             }
 
         }
 
-        public open [ResolvedTo(STATUS)] class resolveMe : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                super<R|A|>()
+        public? open [ResolvedTo(RAW_FIR)] class resolveMe : A {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+                super<A>()
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt
index eacf61b02f9..8a80113d5a9 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt
@@ -1,251 +1,251 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
index daae67566d8..8f656ef43ef 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
@@ -1,251 +1,251 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
-            R|/receive|(R|/functionWithLazyBody|())
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| {
+            receive#(functionWithLazyBody#())
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): R|kotlin/String| {
+        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
index 3dde60b6c40..99fcf6534dc 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
@@ -1,125 +1,125 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : R|kotlin/Int|, [ResolvedTo(RAW_FIR)] K> = R|kotlin/collections/Map<T, K>|
+        public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map<T, K>
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt
index f1c9b3309db..c262c400a1c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt
@@ -1,293 +1,293 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: R|Foo|): R|kotlin/Unit| {
-            R|<local>/foo|.R|/util|<R|Foo|, R|Bar<Foo>|>()
+        public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| {
+            foo#.util#()
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
         }
 
-        public abstract [ResolvedTo(STATUS)] interface Bar<[ResolvedTo(STATUS)] T : R|Foo|> : R|kotlin/Any| {
+        public? final? [ResolvedTo(RAW_FIR)] interface Bar<[ResolvedTo(RAW_FIR)] T : Foo> : R|kotlin/Any| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : R|Foo|, [ResolvedTo(RAW_FIR)] B : R|Bar<F>|> R|F|.util(): R|B| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B {
             ^util Null(null)!!
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
index 888b6a8efc9..30157f8f026 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
@@ -1,16 +1,16 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -21,17 +21,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -42,17 +42,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -63,17 +63,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -84,17 +84,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -105,17 +105,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -126,17 +126,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -147,17 +147,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -168,17 +168,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -189,17 +189,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -210,17 +210,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -231,17 +231,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -252,17 +252,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
@@ -273,17 +273,17 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt
index dbae414b9b0..b4e9ab613d1 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt
@@ -1,15 +1,15 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -17,16 +17,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -34,16 +34,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -51,16 +51,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -68,16 +68,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -85,16 +85,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -102,16 +102,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -119,16 +119,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -136,16 +136,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -153,16 +153,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -170,16 +170,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -187,16 +187,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -204,16 +204,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
@@ -221,16 +221,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
+        public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass<Type>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] t: R|Type|): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
index 2a8bbda4580..3962aa000fb 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
@@ -1,15 +1,15 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -17,16 +17,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -34,16 +34,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -51,16 +51,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -68,16 +68,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -85,16 +85,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -102,16 +102,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -119,16 +119,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -136,16 +136,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -153,16 +153,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -170,16 +170,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -187,16 +187,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -204,16 +204,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
@@ -221,16 +221,16 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
+        public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| {
                 super<R|kotlin/Any|>()
             }
 
-            public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| {
+            public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
             }
 
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt
index ad28d0d664e..12025d138f3 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt
@@ -1,139 +1,139 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| {
         }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt
index bcbaa72bede..d0c55e88d06 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt
@@ -1,167 +1,167 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(RAW_FIR)] get(): R|kotlin/Int| {
-                ^ Int(42)
+        public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int
+            public? [ResolvedTo(RAW_FIR)] get(): Int {
+                ^ IntegerLiteral(42)
             }
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt
index 89698b46e78..a9fe15f1884 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt
@@ -1,223 +1,223 @@
 RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] class X<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor<[ResolvedTo(STATUS)] T>(): R|X<T>| {
+        public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X<T>| {
                 super<R|kotlin/Any|>()
             }
 
         }
 
-        public final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = R|X<TypeParam>|
+        public? final [ResolvedTo(RAW_FIR)] typealias Alias<[ResolvedTo(RAW_FIR)] TypeParam> = X<TypeParam>