diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt
index 172c804dcf8..12b982a7b71 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt
@@ -65,7 +65,12 @@ private class LLFirAnnotationArgumentsMappingTargetResolver(
     )
 
     override fun doLazyResolveUnderLock(target: FirElementWithResolveState) {
-        resolveWithKeeper(target, target.llFirSession, AnnotationArgumentMappingStateKeepers.DECLARATION) {
+        resolveWithKeeper(
+            target,
+            target.llFirSession,
+            AnnotationArgumentMappingStateKeepers.DECLARATION,
+            prepareTarget = FirLazyBodiesCalculator::calculateAnnotations,
+        ) {
             transformAnnotations(target)
         }
     }
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
deleted file mode 100644
index 0cd8af76ad5..00000000000
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers
-
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveTarget
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirElementError
-import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
-import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyBodiesCalculator
-import org.jetbrains.kotlin.fir.FirElementWithResolveState
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.resolve.ResolutionMode
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
-import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirResolveContextCollector
-import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsResolveTransformer
-import org.jetbrains.kotlin.fir.visitors.transformSingle
-
-internal object LLFirAnnotationArgumentsLazyResolver : LLFirLazyResolver(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) {
-    override fun resolve(
-        target: LLFirResolveTarget,
-        lockProvider: LLFirLockProvider,
-        session: FirSession,
-        scopeSession: ScopeSession,
-        towerDataContextCollector: FirResolveContextCollector?,
-    ) {
-        val resolver = LLFirAnnotationArgumentsTargetResolver(target, lockProvider, session, scopeSession, towerDataContextCollector)
-        resolver.resolveDesignation()
-    }
-}
-
-private class LLFirAnnotationArgumentsTargetResolver(
-    target: LLFirResolveTarget,
-    lockProvider: LLFirLockProvider,
-    session: FirSession,
-    scopeSession: ScopeSession,
-    firResolveContextCollector: FirResolveContextCollector?,
-) : LLFirAbstractBodyTargetResolver(
-    target,
-    lockProvider,
-    scopeSession,
-    FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS,
-) {
-    override val transformer = FirAnnotationArgumentsResolveTransformer(
-        session,
-        scopeSession,
-        resolverPhase,
-        returnTypeCalculator = createReturnTypeCalculator(firResolveContextCollector = firResolveContextCollector),
-        firResolveContextCollector = firResolveContextCollector,
-    )
-
-    @Deprecated("Should never be called directly, only for override purposes, please use withRegularClass", level = DeprecationLevel.ERROR)
-    override fun withRegularClassImpl(firClass: FirRegularClass, action: () -> Unit) {
-        transformer.declarationsTransformer.withRegularClass(firClass) {
-            action()
-            firClass
-        }
-    }
-
-    override fun doLazyResolveUnderLock(target: FirElementWithResolveState) {
-        FirLazyBodiesCalculator.calculateAnnotations(target)
-
-        when {
-            target is FirRegularClass -> {
-                val declarationTransformer = transformer.declarationsTransformer
-                target.transformAnnotations(declarationTransformer, ResolutionMode.ContextIndependent)
-                target.transformTypeParameters(declarationTransformer, ResolutionMode.ContextIndependent)
-                target.transformSuperTypeRefs(declarationTransformer, ResolutionMode.ContextIndependent)
-            }
-
-            target is FirScript -> {
-                target.transformAnnotations(transformer.declarationsTransformer, ResolutionMode.ContextIndependent)
-            }
-
-            target.isRegularDeclarationWithAnnotation -> {
-                target.transformSingle(transformer, ResolutionMode.ContextIndependent)
-            }
-
-            target is FirCodeFragment || target is FirFile -> {}
-
-            else -> throwUnexpectedFirElementError(target)
-        }
-    }
-}
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt
index 7e99620d608..3f3d837ae8e 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt
@@ -15,7 +15,6 @@ internal object LLFirLazyPhaseResolverByPhase {
         this[FirResolvePhase.TYPES] = LLFirTypeLazyResolver
         this[FirResolvePhase.STATUS] = LLFirStatusLazyResolver
         this[FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS] = LLFirCompilerAnnotationsLazyResolver
-        this[FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS] = LLFirAnnotationArgumentsLazyResolver
         this[FirResolvePhase.CONTRACTS] = LLFirContractsLazyResolver
         this[FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE] = LLFirImplicitTypesLazyResolver
         this[FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING] = LLFirAnnotationArgumentMappingLazyResolver
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/contract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/inBlockModification/contract.out_of_src_roots.txt
index a8405f0cf64..81f9549d8eb 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/contract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/contract.out_of_src_roots.txt
@@ -18,4 +18,4 @@ public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)
 }
 
 AFTER MODIFICATION:
-public final inline [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
+public final inline [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/contract.txt b/analysis/low-level-api-fir/testData/inBlockModification/contract.txt
index e7c106948e1..4ce9cb6e3c5 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/contract.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/contract.txt
@@ -16,4 +16,4 @@ public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)
 }
 
 AFTER MODIFICATION:
-public final inline [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
+public final inline [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/contractScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/contractScript.txt
index e7c106948e1..4ce9cb6e3c5 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/contractScript.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/contractScript.txt
@@ -16,4 +16,4 @@ public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)
 }
 
 AFTER MODIFICATION:
-public final inline [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
+public final inline [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.out_of_src_roots.txt
index 3949d0b8af2..950b97666d1 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.out_of_src_roots.txt
@@ -18,4 +18,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit|
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.txt
index a2fb4e25c9e..838bd630837 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContract.txt
@@ -15,4 +15,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit|
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContractScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContractScript.txt
index a2fb4e25c9e..838bd630837 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContractScript.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithContractScript.txt
@@ -15,4 +15,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit|
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt
index c49cac7fc88..5de95b7c043 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt
@@ -12,4 +12,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun passLambdaValue([ResolvedTo(BODY_RES
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun passLambdaValue([ResolvedTo(BODY_RESOLVE)] l: R|ERROR CLASS: Symbol not found for ContractBuilder.() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun passLambdaValue([ResolvedTo(BODY_RESOLVE)] l: R|ERROR CLASS: Symbol not found for ContractBuilder.() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.txt
index 47c1cdbbe79..72d29705166 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContract.txt
@@ -12,4 +12,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun passLambdaValue([ResolvedTo(BODY_RES
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun passLambdaValue([ResolvedTo(BODY_RESOLVE)] l: R|kotlin/contracts/ContractBuilder.() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun passLambdaValue([ResolvedTo(BODY_RESOLVE)] l: R|kotlin/contracts/ContractBuilder.() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContractScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContractScript.txt
index 47c1cdbbe79..72d29705166 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContractScript.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithErrorContractScript.txt
@@ -12,4 +12,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun passLambdaValue([ResolvedTo(BODY_RES
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun passLambdaValue([ResolvedTo(BODY_RESOLVE)] l: R|kotlin/contracts/ContractBuilder.() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun passLambdaValue([ResolvedTo(BODY_RESOLVE)] l: R|kotlin/contracts/ContractBuilder.() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContract.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContract.txt
index 3949d0b8af2..950b97666d1 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContract.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContract.txt
@@ -18,4 +18,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit|
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContractScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContractScript.txt
index 3949d0b8af2..950b97666d1 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContractScript.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithFakeContractScript.txt
@@ -18,4 +18,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit|
 }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.out_of_src_roots.txt
index 949bcd5fc8a..f84fe9e68fb 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.out_of_src_roots.txt
@@ -26,8 +26,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int|
     }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int|
-    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var x: R|kotlin/Int|
+    public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
         ^ Q|kotlin/Unit|
     }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.txt
index 27c3eb22663..75b8f8cc461 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContract.txt
@@ -23,8 +23,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int|
     }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int|
-    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var x: R|kotlin/Int|
+    public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
         ^ Q|kotlin/Unit|
     }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractScript.txt
index 27c3eb22663..75b8f8cc461 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractScript.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractScript.txt
@@ -23,8 +23,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int|
     }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int|
-    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var x: R|kotlin/Int|
+    public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
         ^ Q|kotlin/Unit|
     }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.out_of_src_roots.txt
index 5bd8575a30f..106adbb7a76 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.out_of_src_roots.txt
@@ -26,8 +26,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var <no name provided>: R|kotlin/Int|
     }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var <no name provided>: R|kotlin/Int|
-    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var <no name provided>: R|kotlin/Int|
+    public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
         ^ Q|kotlin/Unit|
     }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.txt
index 17adf14c7d5..d7141853240 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutName.txt
@@ -23,8 +23,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var <no name provided>: R|kotlin/Int|
     }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var <no name provided>: R|kotlin/Int|
-    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var <no name provided>: R|kotlin/Int|
+    public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
         ^ Q|kotlin/Unit|
     }
diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutNameScript.txt
index 17adf14c7d5..d7141853240 100644
--- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutNameScript.txt
+++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithBodyWithContractWithoutNameScript.txt
@@ -23,8 +23,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var <no name provided>: R|kotlin/Int|
     }
 
 AFTER MODIFICATION:
-public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var <no name provided>: R|kotlin/Int|
-    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
+public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var <no name provided>: R|kotlin/Int|
+    public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
         ^ Q|kotlin/Unit|
     }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt
index 83a91d79c81..0852aef41cc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt
@@ -358,74 +358,29 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt
     }
     @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt
-    public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
-            LAZY_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(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] 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? [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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
-
-        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](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), <getClass>(Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt
-    public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+    public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
             LAZY_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| {
             LAZY_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(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -446,32 +401,32 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
     }
-    @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), <getClass>(Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
+    @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt
-    public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+    public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
             LAZY_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| {
             LAZY_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(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -492,7 +447,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass
 
     }
-    @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), <getClass>(Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
+    @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt
index b430ee0a2f6..1270f314688 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt
@@ -422,87 +422,34 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
         @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationArgumentsMixScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum<EnumClass>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| {
-                LAZY_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(STATUS)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(STATUS)] 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? [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|<local>/str|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|<local>/ann|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|<local>/c|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*>
-
-            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](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), <getClass>(Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationArgumentsMixScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 LAZY_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| {
                 LAZY_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>|
 
         }
 
@@ -525,7 +472,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), <getClass>(Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
+        @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
         }
 
 
@@ -535,28 +482,28 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationArgumentsMixScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
+        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
                 LAZY_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| {
                 LAZY_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>|
 
         }
 
@@ -579,7 +526,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), <getClass>(Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
+        @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
         }
 
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt
index 882e88e9690..d8d47d1d3c5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
-    @<ERROR TYPE REF: Symbol not found for java>[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
     @<ERROR TYPE REF: Symbol not found for java>[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.txt
index 82a91fe9047..f8bb3fcd6b2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTarget.txt
@@ -70,18 +70,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
-    @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
-    @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
+    @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -90,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt
-    @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
+    @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
             LAZY_super<R|kotlin/Any|>
         }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTargetScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTargetScript.txt
index bfe2c34dcc2..230dbfe7f9b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTargetScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationClassWithJavaTargetScript.txt
@@ -110,27 +110,13 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationClassWithJavaTargetScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationClassWithJavaTargetScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
+        @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -144,7 +130,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationClassWithJavaTargetScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
+        @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
                 LAZY_super<R|kotlin/Any|>
             }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaType.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaType.txt
index 0a20c63b266..d8110fb9fd5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaType.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] main.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] i: R|JavaInterface|): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] main.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] i: R|JavaInterface|): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] main.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] i: R|JavaInterface|): <implicit> { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt
index 34eb7e67f5a..aefdf06721c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] main.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] i: R|JavaInterface|): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] main.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] i: R|JavaInterface|): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] main.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] i: R|JavaInterface|): <implicit> { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClass.txt
index 7074462668a..012dbcb57f2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClass.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt
-    public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClassScript.txt
index f81de4c1964..001d958f2d2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationOnLocalClassScript.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationOnLocalClassScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationParameters.txt
index 0fa8fef07ed..818784552cb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationParameters.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationParameters.txt
@@ -302,60 +302,22 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
-    public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum<X>| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
-            LAZY_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(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] 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? [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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
-    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| {
             LAZY_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(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -372,7 +334,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
         }
 
         @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
@@ -381,20 +343,20 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
-    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| {
             LAZY_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(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -411,7 +373,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
 
         @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationParametersScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationParametersScript.txt
index f112ac5659a..c400d717a50 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationParametersScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationParametersScript.txt
@@ -358,71 +358,26 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationParametersScript.kts>
-        [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| {
-                LAZY_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(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] 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? [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationParametersScript.kts>
         [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| {
                 LAZY_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>|
 
         }
 
@@ -441,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+            @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
             }
 
             @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
@@ -455,20 +410,20 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationParametersScript.kts>
         [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| {
                 LAZY_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>|
 
         }
 
@@ -487,7 +442,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+            @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             }
 
             @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgument.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgument.txt
index 48144fdf853..5ef654431f7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgument.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgument.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
     }
     @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
-    public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass<T>): R|one/Anno<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass<T> = R|<local>/value|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
-
-    }
-    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| {
@@ -126,7 +113,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -140,7 +127,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgumentScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgumentScript.txt
index 67d73faf167..c25dba49cd9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgumentScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationWithTypeArgumentScript.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
         @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationWithTypeArgumentScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass<T>): R|one/Anno<T>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass<T> = R|<local>/value|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
-
-        }
-
-        @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -185,7 +166,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
 
         }
 
-        @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+        @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
@@ -205,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
 
         }
 
-        @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+        @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotations.txt
index 6edf2be78b3..2a747d8ce06 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotations.txt
@@ -46,24 +46,18 @@ FILE: [ResolvedTo(IMPORTS)] annotations.kt
     [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotations container
     @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:R|kotlin/Suppress|[Types](String(1))
-    [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotations container
-    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:R|kotlin/Suppress|[Types](String(1))
+    @FILE:R|kotlin/Suppress|[Types](LAZY_EXPRESSION)
     [ResolvedTo(CONTRACTS)] annotations container
-    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:R|kotlin/Suppress|[Types](String(1))
+    @FILE:R|kotlin/Suppress|[Types](LAZY_EXPRESSION)
     [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotations container
-    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationsScript.txt
index 5115ba2e6f3..bd45cc2d043 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/annotationsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationsScript.txt
@@ -86,38 +86,27 @@ FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
         @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
-    @FILE:R|kotlin/Suppress|[Types](String(1))
-    [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotations container
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
-    @FILE:R|kotlin/Suppress|[Types](String(1))
+    @FILE:R|kotlin/Suppress|[Types](LAZY_EXPRESSION)
     [ResolvedTo(CONTRACTS)] annotations container
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationsScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+        @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
-    @FILE:R|kotlin/Suppress|[Types](String(1))
+    @FILE:R|kotlin/Suppress|[Types](LAZY_EXPRESSION)
     [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotations container
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationsScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+        @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
 
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.out_of_src_roots.txt
index ee21287e480..a96842926ef 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.out_of_src_roots.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val propertyToResolve: R|kotlin/String|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/String| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter.kt
-    @Target[Unresolved](LAZY_EXPRESSION) 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>?
-        public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: R|kotlin/String|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter.kt
     @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.txt
index ba3a65a6818..f38ab3158d1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val propertyToResolve: R|kotlin/String|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/String| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter.kt
-    @Target[Unresolved](LAZY_EXPRESSION) 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>?
-        public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: R|kotlin/String|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter.kt
     @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.out_of_src_roots.txt
index b93c09d90e1..535da297a64 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.out_of_src_roots.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val propertyToResolve: R|kotlin/String|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/String| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2.kt
-    @Target[Unresolved](LAZY_EXPRESSION) 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>?
-        public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: R|kotlin/String|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2.kt
     @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.txt
index c3b9be2249a..6c32eb7f452 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val propertyToResolve: R|kotlin/String|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/String| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2.kt
-    @Target[Unresolved](LAZY_EXPRESSION) 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>?
-        public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: R|kotlin/String|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2.kt
     @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
index ae85855ab95..54378d43d79 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/String| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-anonymousFunctionWithAnnotatedParameter2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @Target[Unresolved](LAZY_EXPRESSION) 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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>?
-            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>? { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.out_of_src_roots.txt
index c53175c19dd..9c68f1e03b5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.out_of_src_roots.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val propertyToResolve: <implicit>
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.kt
-    @Target[Unresolved](LAZY_EXPRESSION) 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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: @Anno[Unresolved](LAZY_EXPRESSION) String?
-        public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) String? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: <implicit>
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.kt
     @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.txt
index f9367009529..cf54792ae7e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val propertyToResolve: <implicit>
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.kt
-    @Target[Unresolved](LAZY_EXPRESSION) 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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: @Anno[Unresolved](LAZY_EXPRESSION) String?
-        public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) String? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: <implicit>
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhase.kt
     @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
index 47a7cdc2837..45b1120d4c0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTyp
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @Target[Unresolved](LAZY_EXPRESSION) 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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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: @Anno[Unresolved](LAZY_EXPRESSION) String?
-            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) String? { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: <implicit>
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
index 3d0360694df..4709912a723 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/String| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-anonymousFunctionWithAnnotatedParameterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @Target[Unresolved](LAZY_EXPRESSION) 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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>?
-            public? [ResolvedTo(RAW_FIR)] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>? { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val propertyToResolve: R|kotlin/String|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classMembers.txt b/analysis/low-level-api-fir/testData/lazyResolve/classMembers.txt
index 5500b8b930f..024a5d267e8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classMembers.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classMembers.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] classMembers.kt
-    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public final [ResolvedTo(STATUS)] val x: R|kotlin/Int| = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
-
-        public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] classMembers.kt
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classMembersScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classMembersScript.txt
index 2eb885fb218..3a81a34fe70 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classMembersScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classMembersScript.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-classMembersScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public final [ResolvedTo(STATUS)] val x: R|kotlin/Int| = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
-
-            public final [ResolvedTo(STATUS)] fun receive([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public final [ResolvedTo(STATUS)] fun functionWithLazyBody(): R|kotlin/String| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/actual.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/actual.txt
index b2d605896c1..6b9683e1d3b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/actual.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/actual.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] actual.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] actual.kt
-    public final actual [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ExpectForActualAttributeKey={}] class Actual : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Actual] constructor(): R|Actual| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun memberFun(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] val a: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Actual] get(): <implicit>
-
-        public? final? actual [ResolvedTo(RAW_FIR)] class NestedActual : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedActual] constructor(): R|Actual.NestedActual| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun member2(): <implicit> { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] actual.kt
     public final actual [ResolvedTo(CONTRACTS)] [ExpectForActualAttributeKey={}] class Actual : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCall.txt
index 60afdc0709d..774fc5eaa8c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCall.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCall.txt
@@ -134,23 +134,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCall.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCall.kt
-    public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class MyClass : R|@R|Anno|(Q|Foo|)  Foo| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|MyClass| {
-            LAZY_super<<implicit>>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCall.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -159,9 +142,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCall.kt
         }
 
     }
-    public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo : R|kotlin/Any| {
     }
-    public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|Anno|(Q|Foo|)  Foo| {
+    public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|Anno|(LAZY_EXPRESSION)  Foo| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|MyClass| {
             LAZY_super<<implicit>>
         }
@@ -176,9 +159,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCall.kt
         }
 
     }
-    public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
+    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo : R|kotlin/Any| {
     }
-    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|Anno|(Q|Foo|)  Foo| {
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|Anno|(LAZY_EXPRESSION)  Foo| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|MyClass| {
             LAZY_super<<implicit>>
         }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCallUnresolved.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCallUnresolved.txt
index e0754ddf5a1..8e313897f17 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCallUnresolved.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithArgumentInsideSuperTypeCallUnresolved.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCallUnresolved.
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCallUnresolved.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class MyClass : <ERROR TYPE REF: Symbol not found for Foo> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|MyClass| {
-            LAZY_super<<implicit>>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithArgumentInsideSuperTypeCallUnresolved.kt
     public final [ResolvedTo(CONTRACTS)] class MyClass : <ERROR TYPE REF: Symbol not found for Foo> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithConstantFromNestedClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithConstantFromNestedClass.txt
index 0586a32df0d..29740f9791a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithConstantFromNestedClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithConstantFromNestedClass.txt
@@ -278,41 +278,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithConstantFromNestedClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithConstantFromNestedClass.kt
-    public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.number] number: Int): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-    }
-    public final [ResolvedTo(STATUS)] class Outer : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Outer] constructor(): R|Outer| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final companion [ResolvedTo(STATUS)] object Companion : R|kotlin/Any| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|Outer.Companion| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final const [ResolvedTo(STATUS)] val CONSTANT_FROM_COMPANION: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
-
-            @R|Anno|[Types](CONSTANT_FROM_COMPANION#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Nested : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor(): R|Outer.Companion.Nested| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithConstantFromNestedClass.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -337,7 +302,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithConstantFromNestedClass.kt
             public final const [ResolvedTo(STATUS)] val CONSTANT_FROM_COMPANION: <implicit> = LAZY_EXPRESSION
                 public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
 
-            @R|Anno|[Types](CONSTANT_FROM_COMPANION#) public final [ResolvedTo(CONTRACTS)] class Nested : R|kotlin/Any| {
+            @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class Nested : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor(): R|Outer.Companion.Nested| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -372,7 +337,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithConstantFromNestedClass.kt
             public final const [ResolvedTo(STATUS)] val CONSTANT_FROM_COMPANION: <implicit> = LAZY_EXPRESSION
                 public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
 
-            @R|Anno|[Types](CONSTANT_FROM_COMPANION#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested : R|kotlin/Any| {
+            @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor(): R|Outer.Companion.Nested| {
                     LAZY_super<R|kotlin/Any|>
                 }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithTarget.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithTarget.txt
index 64f1663961a..e73ff8a56d8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithTarget.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithTarget.txt
@@ -166,30 +166,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt
-    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
-
-    }
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] annotationWithTarget.kt
-    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -210,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt
-    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
             LAZY_super<R|kotlin/Any|>
         }
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 ee560239185..11fb915aa57 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithTargetScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/annotationWithTargetScript.txt
@@ -214,40 +214,13 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-annotationWithTargetScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: Int = R|<local>/value|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): Int
-
-        }
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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|)
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationWithTargetScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -274,7 +247,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
     SCRIPT: [ResolvedTo(TYPES)] <script-annotationWithTargetScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| {
                 LAZY_super<R|kotlin/Any|>
             }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/classWithTypeParameters.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/classWithTypeParameters.txt
index 3fd37a3060d..2b7058fc422 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/classWithTypeParameters.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/classWithTypeParameters.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class ResolveMe<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K>(): R|ResolveMe<T, K>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt
     public final [ResolvedTo(CONTRACTS)] class ResolveMe<[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> : R|kotlin/Any| {
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 a1dd910c909..8b109858def 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/classWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/classWithTypeParametersScript.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-classWithTypeParametersScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class ResolveMe<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K>(): R|ResolveMe<T, K>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict.txt
index ff95193fd59..01012824dc6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict.txt
@@ -262,39 +262,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict.kt
-    public final [ResolvedTo(STATUS)] object Some : R|kotlin/Any| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=Some] constructor(): R|Some| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class Ann : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] enum class AnnotationTarget : R|kotlin/Enum<Some.AnnotationTarget>| {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnnotationTarget] constructor(): R|Some.AnnotationTarget| {
-                LAZY_super<R|kotlin/Enum<Some.AnnotationTarget>|>
-            }
-
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnnotationTarget] enum entry CLASS: R|Some.AnnotationTarget|
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnnotationTarget] fun values(): R|kotlin/Array<Some.AnnotationTarget>| {
-            }
-
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnnotationTarget] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|Some.AnnotationTarget| {
-            }
-
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnnotationTarget] val entries: R|kotlin/enums/EnumEntries<Some.AnnotationTarget>|
-                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<Some.AnnotationTarget>|
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict.kt
     public final [ResolvedTo(STATUS)] object Some : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict2.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict2.txt
index 6f5c9c307cb..6e591b6ff03 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/compilerRequiredAnnotationConflict2.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
-    public final [ResolvedTo(STATUS)] object Some : R|kotlin/Any| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=Some] constructor(): R|Some| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|kotlin/annotation/Target|[Types](R|kotlin/annotation/AnnotationTarget.FIELD|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class Ann : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final const [ResolvedTo(STATUS)] val FIELD: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Some] get(): <implicit>
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
     public final [ResolvedTo(STATUS)] object Some : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/functionInValueClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/functionInValueClass.txt
index 10382eadfc2..e447dc690e1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/functionInValueClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/functionInValueClass.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
-    @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| {
-            LAZY_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(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : 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 43c2ed78ca8..9d384203fa5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/functionInValueClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/functionInValueClassScript.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionInValueClassScript.kts>
-        [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| {
-                LAZY_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(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverride.txt
index 9177e3bc874..bef124528ed 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverride.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val str: String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Usage : R|Foo2| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-            LAZY_super<<implicit>>
-        }
-
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
     public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt
index ae4a255e63c..b6327a1c91b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val str: String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
-
-        public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
-
-    }
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class OuterClass : R|Foo1| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
     public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt
index c7053190dc6..90da31cc5cb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class NestedClass : R|Foo2| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 0753d6d4bf8..f11118c52ed 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass2Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class NestedClass : R|Foo2| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt
index 423a578569e..dea6e8b7faf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 43b47d8f956..a735ac3f812 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass3Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt
index e09afb775d4..39200374b8f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(SUPER_TYPES)] class NestedClass : R|Foo2| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 0bcc1bedf74..c2a170a0f84 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass4Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(SUPER_TYPES)] class NestedClass : R|Foo2| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 73478ba94f0..0905cc66e91 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClassScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val str: String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
-
-            public? final? [ResolvedTo(RAW_FIR)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): Boolean
-
-        }
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class OuterClass : R|Foo1| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 d5cbf61620b..ec81ae2da53 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/hierarchyWithOverrideScript.txt
@@ -286,42 +286,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val str: String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Usage : R|Foo2| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClass.txt
index 1727874b2ee..f480c70f656 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClass.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
-    public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-            LAZY_super<R|TopLevelClass|>
-        }
-
-    }
-    public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-            LAZY_super<R|AnotherTopLevelClass|>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class NestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
     public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument.txt
index f9c04179189..4b2b7175fde 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Special.why] why: KClass<*>): R|Special| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val why: KClass<*> = R|<local>/why|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] get(): KClass<*>
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Interface : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(STATUS)] class Outer : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Outer] constructor(): R|Outer| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|Special|[Types](<getClass>(Q|Outer.Nested|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Nested<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> : R|@R|Special|(<getClass>(Q|Outer.Nested|))  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T>(): R|Outer.Nested<T>| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
@@ -259,8 +232,8 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](<getClass>(Q|Outer.Nested|)) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(<getClass>(Q|Outer.Nested|))  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
@@ -286,8 +259,8 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](<getClass>(Q|Outer.Nested|)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(<getClass>(Q|Outer.Nested|))  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument2.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument2.txt
index 5a10ffcf04e..73a72fe9f6d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassAsAnnotationArgument2.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument2.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Special.why] why: KClass<*>): R|Special| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val why: KClass<*> = R|<local>/why|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] get(): KClass<*>
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Interface : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(STATUS)] class Outer : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Outer] constructor(): R|Outer| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|Special|[Types](Q|Outer.Nested|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Nested<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> : R|@R|Special|(Q|Outer.Nested|)  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T>(): R|Outer.Nested<T>| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument2.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
@@ -259,8 +232,8 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](Q|Outer.Nested|) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(Q|Outer.Nested|)  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
@@ -286,8 +259,8 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassAsAnnotationArgument2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](Q|Outer.Nested|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(Q|Outer.Nested|)  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
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 ee53e7427cb..da7c30cb7fd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassScript.txt
@@ -278,41 +278,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedClassScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public open [ResolvedTo(STATUS)] class AnotherTopLevelClass : R|TopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                LAZY_super<R|TopLevelClass|>
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] class OuterClass : R|AnotherTopLevelClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
-                LAZY_super<R|AnotherTopLevelClass|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class NestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt
index 4c1bfcff22b..9311c5c4ef0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
-    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(ARGUMENTS_OF_ANNOTATIONS)] class ResolveMe : R|OV| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
     public abstract [ResolvedTo(STATUS)] interface OV : 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 c1cd0a5e56c..ffcfba4c7d3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
@@ -238,36 +238,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedClassWithPropertiesOverridesScript.kts>
-        [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(ARGUMENTS_OF_ANNOTATIONS)] class ResolveMe : R|OV| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
-                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument.txt
index 7447aa5c1b6..7ccb823888c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Special.why] why: KClass<*>): R|Special| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val why: KClass<*> = R|<local>/why|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] get(): KClass<*>
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Interface : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(STATUS)] class Outer : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Outer] constructor(): R|Outer| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|Special|[Types](<getClass>(Q|Outer.Nested|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Nested<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> : R|@R|Special|(<getClass>(Q|Outer.Nested|))  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T>(): R|Outer.Nested<T>| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
@@ -259,8 +232,8 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](<getClass>(Q|Outer.Nested|)) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(<getClass>(Q|Outer.Nested|))  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
@@ -286,8 +259,8 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](<getClass>(Q|Outer.Nested|)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(<getClass>(Q|Outer.Nested|))  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](<getClass>(Q|Outer.Nested|)) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument2.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument2.txt
index c83b8288ec0..e7964a03550 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/qualifiedNestedClassAsAnnotationArgument2.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument2.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Special.why] why: KClass<*>): R|Special| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val why: KClass<*> = R|<local>/why|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Special] get(): KClass<*>
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Interface : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(STATUS)] class Outer : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Outer] constructor(): R|Outer| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|Special|[Types](Q|Outer.Nested|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Nested<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> : R|@R|Special|(Q|Outer.Nested|)  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T>(): R|Outer.Nested<T>| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument2.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Special : R|kotlin/Annotation| {
@@ -259,8 +232,8 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](Q|Outer.Nested|) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(Q|Outer.Nested|)  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
@@ -286,8 +259,8 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedNestedClassAsAnnotationArgument2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Special|[Types](Q|Outer.Nested|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(Q|Outer.Nested|)  Interface| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](Q|Outer.Nested|) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
+        @R|Special|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Nested<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> : R|@R|Special|(LAZY_EXPRESSION)  Interface| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor<@R|Special|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T>(): R|Outer.Nested<T>| {
                 LAZY_super<<implicit>>
             }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride.txt
index 583975fadb3..e959f244eeb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
     public abstract [ResolvedTo(CONTRACTS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2.txt
index 0e4275efc29..8ff8effb1e4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
     public abstract [ResolvedTo(CONTRACTS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2Script.txt
index 2a7bdd863bb..8b85ea7deea 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverride2Script.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-simpleLoopInOverride2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverrideScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverrideScript.txt
index 4db4672a42c..bca6cd9abea 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/simpleLoopInOverrideScript.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-simpleLoopInOverrideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt
index 4f0d9876b3e..e0988c4869c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
index 170494be5e9..38e63b099b7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-compilerRequiredAnnotationOnLocalClassScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt
index ccd893df517..8505aa4f6c6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(constructor)) @R|Anno|[Types](String(constructor)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](String(param)) i: R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](String(parameter)) b: R|kotlin/String|): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -199,7 +178,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt
 
     }
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](String(constructor)) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](String(param)) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](String(parameter)) b: R|kotlin/String|): R|A| {
+        @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| {
             LAZY_super<R|kotlin/Any|>
         }
 
@@ -220,7 +199,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt
 
     }
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](String(constructor)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](String(param)) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](String(parameter)) b: R|kotlin/String|): R|A| {
+        @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| {
             LAZY_super<R|kotlin/Any|>
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt
index a3887d10e01..9373c7f6471 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](String(field)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -203,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](String(field)) public final [ResolvedTo(CONTRACTS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+        @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] get(): R|kotlin/Int|
 
     }
@@ -224,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](String(field)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+        @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int|
 
     }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
index 6ac76bf60ce..0bbb1a9db72 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-compilerRequiredAnnotationsOnConstructorPropertyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(STATUS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](String(field)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] get(): R|kotlin/Int|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -262,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri
                 LAZY_super<R|kotlin/Any|>
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](String(field)) public final [ResolvedTo(CONTRACTS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+            @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
                 public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] get(): R|kotlin/Int|
 
         }
@@ -289,7 +262,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri
                 LAZY_super<R|kotlin/Any|>
             }
 
-            @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](String(property)) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](String(field)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+            @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
                 public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int|
 
         }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
index 107fb66add6..3eb4a465998 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-compilerRequiredAnnotationsOnConstructorScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(constructor)) @R|Anno|[Types](String(constructor)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](String(param)) i: R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](String(parameter)) b: R|kotlin/String|): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @PROPERTY:R|kotlin/Deprecated|[Types](String(property)) @PROPERTY:R|Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|kotlin/Deprecated|[Types](String(field)) @FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/Int|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -258,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
         }
 
         public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](String(constructor)) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](String(param)) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](String(parameter)) b: R|kotlin/String|): R|A| {
+            @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -285,7 +258,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
         }
 
         public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](String(constructor)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](String(param)) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](String(parameter)) b: R|kotlin/String|): R|A| {
+            @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -374,4 +347,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] compilerRequiredAnnotationsOnConstructorScript.
                 public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int|
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunction.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunction.txt
index 81db8d0445c..ae1b6fe9477 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunction.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunction.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunction.kt
     }
     @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun fooo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunction.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(function)) @R|Anno|[Types](String(function)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun fooo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](String(a)) a: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunction.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -126,7 +113,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunction.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](String(function)) public final [ResolvedTo(CONTRACTS)] fun fooo([ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+    @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun fooo([ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -140,7 +127,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunction.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](String(function)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun fooo([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+    @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun fooo([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
index cfc776d9d58..ef6b00d0c01 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
         @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun fooo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-compilerRequiredAnnotationsOnFunctionScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(function)) @R|Anno|[Types](String(function)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun fooo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](String(a)) a: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -185,7 +166,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](String(function)) public final [ResolvedTo(CONTRACTS)] fun fooo([ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun fooo([ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
 
@@ -205,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](String(function)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun fooo([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](String(a)) a: R|kotlin/Int|): R|kotlin/Unit| {
+        @R|kotlin/Deprecated|[Types](String(function)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun fooo([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(a)) @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnProperty.txt
index a12684291d3..613f5bcf251 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnProperty.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnProperty.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnProperty.kt
         @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
         @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](LAZY_EXPRESSION) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnProperty.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(property)) @R|Anno|[Types](String(property)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var memberProperty: <implicit> = LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](String(getter)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-        @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](String(setparam)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnProperty.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -144,11 +129,11 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnProperty.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](String(property)) public final [ResolvedTo(CONTRACTS)] var memberProperty: <implicit> = IntegerLiteral(32)
-        @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](String(getter)) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
+    @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var memberProperty: <implicit> = IntegerLiteral(32)
+        @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
             ^ field#
         }
-        @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](String(setparam)) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] value: <implicit>): R|kotlin/Unit| {
+        @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](LAZY_EXPRESSION) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] value: <implicit>): R|kotlin/Unit| {
             field# = value#
         }
 
@@ -163,11 +148,11 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnProperty.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](String(property)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var memberProperty: R|kotlin/Int| = Int(32)
-        @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](String(getter)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
+    @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var memberProperty: R|kotlin/Int| = Int(32)
+        @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
             ^ field#
         }
-        @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](String(setparam)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
+        @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](LAZY_EXPRESSION) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
             field# = value#
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.out_of_src_roots.txt
index f9a75687265..120c70c93e6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.out_of_src_roots.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
             ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -153,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(CONTRACTS)] val memberProperty: <implicit>by LAZY_EXPRESSION
+    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] val memberProperty: <implicit>by LAZY_EXPRESSION
         public [ResolvedTo(CONTRACTS)] get(): <implicit> {
             ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
         }
@@ -169,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val memberProperty: <ERROR TYPE REF: Unresolved name: getValue>by <Unresolved name: lazy>#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
+    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val memberProperty: <ERROR TYPE REF: Unresolved name: getValue>by <Unresolved name: lazy>#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
         ^ String(42)
     }
     )
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt
index 5a67b36f2e6..cc080d3b066 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
             ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -153,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(CONTRACTS)] val memberProperty: <implicit>by LAZY_EXPRESSION
+    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] val memberProperty: <implicit>by LAZY_EXPRESSION
         public [ResolvedTo(CONTRACTS)] get(): <implicit> {
             ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
         }
@@ -169,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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>  {
+    field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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)
     }
     )
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
index 9aaa4446139..56ceca167c0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
             }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-compilerRequiredAnnotationsOnPropertyDelegateScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -212,7 +190,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(CONTRACTS)] val memberProperty: <implicit>by LAZY_EXPRESSION
+        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] val memberProperty: <implicit>by LAZY_EXPRESSION
             public [ResolvedTo(CONTRACTS)] get(): <implicit> {
                 ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
             }
@@ -234,7 +212,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
 
         }
 
-        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](String(delegate)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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>  {
+        field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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)
         }
         )
@@ -316,4 +294,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] compilerRequiredAnnotationsOnPropertyDelegateSc
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| {
                 ^ D|/memberProperty|.R|kotlin/getValue|<R|kotlin/String|>(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 c1554f7139b..91d277e4ec4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
             @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](LAZY_EXPRESSION) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-compilerRequiredAnnotationsOnPropertyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(property)) @R|Anno|[Types](String(property)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var memberProperty: <implicit> = LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](String(getter)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](String(setparam)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -203,11 +182,11 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](String(property)) public final [ResolvedTo(CONTRACTS)] var memberProperty: <implicit> = IntegerLiteral(32)
-            @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](String(getter)) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
+        @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var memberProperty: <implicit> = IntegerLiteral(32)
+            @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
                 ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](String(setparam)) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] value: <implicit>): R|kotlin/Unit| {
+            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](LAZY_EXPRESSION) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] value: <implicit>): R|kotlin/Unit| {
                 field# = value#
             }
 
@@ -228,11 +207,11 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](String(property)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var memberProperty: R|kotlin/Int| = Int(32)
-            @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](String(getter)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
+        @R|kotlin/Deprecated|[Types](String(property)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var memberProperty: R|kotlin/Int| = Int(32)
+            @R|kotlin/Deprecated|[Types](String(getter)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
                 ^ field#
             }
-            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](String(setter)) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](String(setparam)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
+            @PROPERTY_SETTER:R|kotlin/Deprecated|[Types](String(setter)) @R|Anno|[Types](LAZY_EXPRESSION) @SETTER_PARAMETER:R|kotlin/Deprecated|[Types](String(setparam)) @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
                 field# = value#
             }
 
@@ -310,4 +289,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] compilerRequiredAnnotationsOnPropertyScript.kts
             @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(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| {
                 F|/memberProperty| = R|<local>/value|
             }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchy.txt b/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchy.txt
index f014c9bdbf2..28f9df5e527 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchy.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchy.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt
-    public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt
     public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchyScript.txt
index 615932690e0..58fff794ea6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/complexLocalHierarchyScript.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-complexLocalHierarchyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| {
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt
index b9105343ca9..cc2d88fe266 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt
@@ -734,98 +734,6 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt
     }
     public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt
-    public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(STATUS)] class B : R|A| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-            LAZY_super<R|A|>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface C : A {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
-            LAZY_super<A>
-        }
-
-    }
-    public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-        protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] object H : P {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
-                LAZY_super<P>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class J : P {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
-                LAZY_super<P>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] object V : P {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                    LAZY_super<P>
-                }
-
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class M : P {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                    LAZY_super<P>
-                }
-
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] val p: R|P| = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
-
-        public final [ResolvedTo(STATUS)] val r: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): <implicit>
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] class K : P {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
-            LAZY_super<P>
-        }
-
-    }
-    public final [ResolvedTo(STATUS)] object B : R|kotlin/Any| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(STATUS)] class I : R|P| {
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                LAZY_super<R|P|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt
     public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt
index b1da3f79dcb..5fd43af546c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt
@@ -838,111 +838,6 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
         public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-complexRedeclarationScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] class B : R|A| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                LAZY_super<R|A|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface C : A {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface D : C, A {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class E : B, A {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=E] constructor(): R|E| {
-                LAZY_super<A>
-            }
-
-        }
-
-        public sealed [ResolvedTo(STATUS)] class P : R|kotlin/Any| {
-            protected [ResolvedTo(STATUS)] [ContainingClassKey=P] constructor(): R|P| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] object H : P {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=H] constructor(): R|P.H| {
-                    LAZY_super<P>
-                }
-
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class J : P {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=J] constructor(): R|P.J| {
-                    LAZY_super<P>
-                }
-
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] object T : R|kotlin/Any| {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=T] constructor(): R|P.T| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] object V : P {
-                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=V] constructor(): R|P.T.V| {
-                        LAZY_super<P>
-                    }
-
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] class M : P {
-                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=M] constructor(): R|P.T.M| {
-                        LAZY_super<P>
-                    }
-
-                }
-
-            }
-
-            public final [ResolvedTo(STATUS)] val p: R|P| = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): R|P|
-
-            public final [ResolvedTo(STATUS)] val r: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=P] get(): <implicit>
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class K : P {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=K] constructor(): R|K| {
-                LAZY_super<P>
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] object B : R|kotlin/Any| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(STATUS)] class I : R|P| {
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=I] constructor(): R|B.I| {
-                    LAZY_super<R|P|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun test(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -1493,4 +1388,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] complexRedeclarationScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy.txt
index d3579e360eb..ffa855fbd99 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt
     public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt
-    public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
-    }
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt
     public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2.txt
index 8a5935347f7..a03087644ab 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt
     public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /E> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /ResolveMe> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /ResolveMe> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface E : <ERROR TYPE REF: Loop in supertype: /E -> /F> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt
     public abstract [ResolvedTo(CONTRACTS)] interface ResolveMe : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /E> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2Script.txt
index c13b9504f64..5dd4b608b61 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy2Script.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchy2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /E> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /ResolveMe> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /ResolveMe> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface E : <ERROR TYPE REF: Loop in supertype: /E -> /F> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3.txt
index 4527b3b0b5a..b90943b24ee 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt
     public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C2 {
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt
-    public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : <ERROR TYPE REF: Loop in supertype: /C1 -> /B> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface C2 : <ERROR TYPE REF: Loop in supertype: /C2 -> /C1> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface D1 : <ERROR TYPE REF: Loop in supertype: /D1 -> /B> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface D2 : <ERROR TYPE REF: Loop in supertype: /D2 -> /D1> {
-    }
-    public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D2>, <ERROR TYPE REF: Loop in supertype: /F -> /C2> {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C2 {
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt
     public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3Script.txt
index 4343f63a9c2..93836f63272 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchy3Script.txt
@@ -246,37 +246,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchy3Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : <ERROR TYPE REF: Loop in supertype: /C1 -> /B> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface C2 : <ERROR TYPE REF: Loop in supertype: /C2 -> /C1> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface D1 : <ERROR TYPE REF: Loop in supertype: /D1 -> /B> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface D2 : <ERROR TYPE REF: Loop in supertype: /D2 -> /D1> {
-        }
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D2>, <ERROR TYPE REF: Loop in supertype: /F -> /C2> {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C2 {
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchyScript.txt
index 6d23ddfe328..ceecf80d44b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicHierarchyScript.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
-        }
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy.txt
index 0f0c32c159b..b2dab51a729 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt
-    public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
-            LAZY_super<D>
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? open [ResolvedTo(SUPER_TYPES)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
-            LAZY_super<C.CC>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt
     public open [ResolvedTo(CONTRACTS)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2.txt
index 6a659a42d97..9ab938264c8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt
-    public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
-            LAZY_super<D>
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
-            LAZY_super<C.CC>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt
     public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2Script.txt
index 69bf8c92ab5..870c590db33 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchy2Script.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-cyclicNestedHierarchy2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
-                LAZY_super<D>
-            }
-
-            public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
-                LAZY_super<C.CC>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchyScript.txt
index c04d879722a..b267e75acab 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/cyclicNestedHierarchyScript.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchyScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-cyclicNestedHierarchyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
-                LAZY_super<D>
-            }
-
-            public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
-                LAZY_super<C.CC>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt
index 05bb9f45f1d..3e14b957518 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt
-    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| {
-            LAZY_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(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 operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
-
-        public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun copy([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] b: R|kotlin/Boolean| = this@R|one/DataClass|.R|one/DataClass.b|): R|one/DataClass|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt
     public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt
index 809edfa9197..0cbc6d7a927 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-dataClassCopyScript.kts>
-        [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| {
-                LAZY_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(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 operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
-
-            public final operator [ResolvedTo(STATUS)] fun component2(): R|kotlin/Boolean|
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun copy([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] i: R|kotlin/Int| = this@R|one/DataClass|.R|one/DataClass.i|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] b: R|kotlin/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|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2.txt
index d4e81830297..8d3c1df3269 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt
-    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| {
-            LAZY_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(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 operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
-
-        public final operator [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun component2(): R|kotlin/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|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt
     public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt
index 95393c978d8..a3fde083c3e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-dataComponent2Script.kts>
-        [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| {
-                LAZY_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(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 operator [ResolvedTo(STATUS)] fun component1(): R|kotlin/Int|
-
-            public final operator [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun component2(): R|kotlin/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|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt
index ae29f8784c9..fe46db0b1e7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt
@@ -120,23 +120,6 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt
 EXPECT_ACTUAL_MATCHING:
 TARGET: public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): <implicit>
 
-FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt
-    public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Aaa] constructor([ResolvedTo(STATUS)] i: R|Interface|): R|Aaa| {
-            LAZY_super<<implicit>>
-        }
-
-        private final [ResolvedTo(STATUS)] field $$delegate_0: R|Interface| = LAZY_EXPRESSION
-
-    }
-    public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-        public open [ResolvedTo(STATUS)] fun implicitType(): <implicit> { LAZY_BLOCK }
-
-    }
-
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): <implicit>
-
 FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt
     public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Aaa] constructor([ResolvedTo(STATUS)] i: R|Interface|): R|Aaa| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt
index 9810c3af514..88f7b78e01a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt
@@ -92,19 +92,6 @@ FILE: [ResolvedTo(IMPORTS)] usage.kt
 EXPECT_ACTUAL_MATCHING:
 TARGET: public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): <implicit>
 
-FILE: [ResolvedTo(IMPORTS)] usage.kt
-    public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Aaa] constructor([ResolvedTo(STATUS)] i: R|Interface|): R|Aaa| {
-            LAZY_super<<implicit>>
-        }
-
-        private final [ResolvedTo(STATUS)] field $$delegate_0: R|Interface| = LAZY_EXPRESSION
-
-    }
-
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): <implicit>
-
 FILE: [ResolvedTo(IMPORTS)] usage.kt
     public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Aaa] constructor([ResolvedTo(STATUS)] i: R|Interface|): R|Aaa| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt
index e92c2fe5d4c..036d3b860da 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): <implicit>
-
-FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-delegateWithImplicitTypeScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Aaa] constructor([ResolvedTo(STATUS)] i: R|Interface|): R|Aaa| {
-                LAZY_super<<implicit>>
-            }
-
-            private final [ResolvedTo(STATUS)] field $$delegate_0: R|Interface| = LAZY_EXPRESSION
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
-            public open [ResolvedTo(STATUS)] fun implicitType(): <implicit> { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 TARGET: public open [ResolvedTo(CONTRACTS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): <implicit>
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt
index e5663695b29..58738db46bb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] delegatedField.kt
-    public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
-            LAZY_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(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| {
-            LAZY_super<<implicit>>
-        }
-
-        private final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] field $$delegate_0: R|one/Foo| = LAZY_EXPRESSION
-
-        public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegatedField.kt
     public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt
index d3273c0c561..a407deeaa0c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt
@@ -238,36 +238,6 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-delegatedFieldScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
-                LAZY_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(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| {
-                LAZY_super<<implicit>>
-            }
-
-            private final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] field $$delegate_0: R|one/Foo| = LAZY_EXPRESSION
-
-            public final [ResolvedTo(STATUS)] fun baz([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt
index a3e3de0bf1d..322e0e19ecb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
             ^ D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] delegates.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] val delegate: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
-        }
-    public? final? [ResolvedTo(RAW_FIR)] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
-        }
-    public? final? [ResolvedTo(RAW_FIR)] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
-        }
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
-        }
-    public? final? [ResolvedTo(RAW_FIR)] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
-        }
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
-        }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt
index 02d4a049750..608d02c75b7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt
@@ -318,46 +318,6 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-delegatesScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] val delegate: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        public? final? [ResolvedTo(RAW_FIR)] val valueWithExplicitType: Intby LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
-            }
-
-        public? final? [ResolvedTo(RAW_FIR)] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
-            }
-
-        public? final? [ResolvedTo(RAW_FIR)] var variableWithExplicitType: Intby LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
-            }
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| {
-                ^ D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
-            }
-
-        public? final? [ResolvedTo(RAW_FIR)] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
-            }
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| {
-                ^ D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
-            }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -609,4 +569,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] delegatesScript.kts
             public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
             }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumEntries.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumEntries.txt
index 3399a5813a9..ed243eba586 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumEntries.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumEntries.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumEntries.kt
-    public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
-            LAZY_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(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
-        }
-
-        public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntries.kt
     public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumEntriesScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumEntriesScript.txt
index 9ca2bda27f6..f766b124755 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumEntriesScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumEntriesScript.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-enumEntriesScript.kts>
-        [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| {
-                LAZY_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(STATUS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|one/MyEnum| {
-            }
-
-            public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumEntry.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumEntry.txt
index 1103a22c186..7df578e7bbc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumEntry.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumEntry.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
-    public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
-            LAZY_super<R|kotlin/Enum<Foo>|>
-        }
-
-        @R|Anno|[Types]() public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
-        public final static [ResolvedTo(STATUS)] [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(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-            public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumEntryScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumEntryScript.txt
index cedc4707e61..7368706bc64 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumEntryScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumEntryScript.txt
@@ -246,37 +246,6 @@ FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-enumEntryScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] enum class Foo : R|kotlin/Enum<Foo>| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| {
-                LAZY_super<R|kotlin/Enum<Foo>|>
-            }
-
-            @R|Anno|[Types]() public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
-            public final static [ResolvedTo(STATUS)] [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(STATUS)] [ContainingClassKey=Foo] val entries: R|kotlin/enums/EnumEntries<Foo>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Foo>|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumValueOf.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumValueOf.txt
index cb916b22e65..f44e1c4d6d3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumValueOf.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumValueOf.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt
-    public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
-            LAZY_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(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] 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>|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt
     public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumValueOfScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumValueOfScript.txt
index 9fed0cec558..e7ca201bb36 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumValueOfScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumValueOfScript.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-enumValueOfScript.kts>
-        [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| {
-                LAZY_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(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=MyEnum] fun valueOf([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] 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>|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/enumValues.txt b/analysis/low-level-api-fir/testData/lazyResolve/enumValues.txt
index 740223d737e..a267cf0ea92 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumValues.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumValues.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumValues.kt
-    public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
-        private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
-            LAZY_super<R|kotlin/Enum<one/MyEnum>|>
-        }
-
-        public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-        public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [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(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-            public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumValues.kt
     public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum<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 94f438542ab..dfe9441101f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/enumValuesScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/enumValuesScript.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-enumValuesScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Enum<one/MyEnum>|>
-            }
-
-            public final static [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] enum entry ENTRY: R|one/MyEnum|
-            public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [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(STATUS)] [ContainingClassKey=MyEnum] val entries: R|kotlin/enums/EnumEntries<one/MyEnum>|
-                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/errors/annotationWithNamedFunctionArgument.txt b/analysis/low-level-api-fir/testData/lazyResolve/errors/annotationWithNamedFunctionArgument.txt
index 2a816a472c3..d94886a6b3f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/errors/annotationWithNamedFunctionArgument.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/errors/annotationWithNamedFunctionArgument.txt
@@ -70,22 +70,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
-    @<ERROR TYPE REF: Symbol not found for Anno>[Types](ERROR_EXPR(Incorrect invoke receiver)local final? [ResolvedTo(RAW_FIR)] fun a(): String {
-    }
-    .invoke#()) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class TopLevelClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
-    @<ERROR TYPE REF: Symbol not found for Anno>[Types](ERROR_EXPR(Incorrect invoke receiver)local final? [ResolvedTo(RAW_FIR)] fun a(): String {
-    }
-    .invoke#()) public final [ResolvedTo(CONTRACTS)] class TopLevelClass : R|kotlin/Any| {
+    @<ERROR TYPE REF: Symbol not found for Anno>[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class TopLevelClass : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -94,9 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
-    @<ERROR TYPE REF: Symbol not found for Anno>[Types](ERROR_EXPR(Incorrect invoke receiver)local final? [ResolvedTo(RAW_FIR)] fun a(): String {
-    }
-    .invoke#()) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
+    @<ERROR TYPE REF: Symbol not found for Anno>[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
             LAZY_super<R|kotlin/Any|>
         }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/errors/anonymousObjectInInvalidPosition.txt b/analysis/low-level-api-fir/testData/lazyResolve/errors/anonymousObjectInInvalidPosition.txt
index 4e8a69c538c..ef86146a039 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/errors/anonymousObjectInInvalidPosition.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/errors/anonymousObjectInInvalidPosition.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
-    private final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val resolveMe: <ERROR TYPE REF: Wrong number of type arguments> = LAZY_EXPRESSION
-        private [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <ERROR TYPE REF: Wrong number of type arguments>
-    public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
-        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
     private final [ResolvedTo(CONTRACTS)] val resolveMe: <ERROR TYPE REF: Wrong number of type arguments> = ERROR_EXPR(Should have initializer)Null(null) = object : A<Int> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/expectClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/expectClass.txt
index e0ab4f4640d..1b652b41017 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/expectClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/expectClass.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] expectClass.kt
     public final expect [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Foo : R|kotlin/Any| {
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] expectClass.kt
-    public final expect [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Foo : R|kotlin/Any| {
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] expectClass.kt
     public final expect [ResolvedTo(CONTRACTS)] class Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fakeOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/fakeOverride.txt
index a85a0fd966c..79830953b03 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fakeOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fakeOverride.txt
@@ -302,44 +302,6 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun expression([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] expression: R|IrConst<*>|): R|kotlin/Unit| { LAZY_BLOCK }
-    public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
-        protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val asString: String = R|<local>/asString|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] get(): String
-
-        @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun valueOf([ResolvedTo(RAW_FIR)] aConst: IrConst<*>): <implicit> { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] object Null : Kind<Nothing?> {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Null] constructor(): R|Kind.Null| {
-                LAZY_super<Kind<Nothing?>>
-            }
-
-        }
-
-        public? open? override [ResolvedTo(RAW_FIR)] fun toString(): <implicit> { LAZY_BLOCK }
-
-    }
-    public? abstract [ResolvedTo(RAW_FIR)] class IrConst<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] constructor<[ResolvedTo(RAW_FIR)] T>(): R|IrConst<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] var kind: Kind<T>
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] get(): Kind<T>
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] set([ResolvedTo(RAW_FIR)] value: Kind<T>): R|kotlin/Unit|
-
-        public? abstract [ResolvedTo(RAW_FIR)] var value: T
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] get(): T
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] set([ResolvedTo(RAW_FIR)] value: T): R|kotlin/Unit|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt
     public final [ResolvedTo(CONTRACTS)] fun expression([ResolvedTo(CONTRACTS)] expression: R|IrConst<*>|): R|kotlin/Unit| {
@@ -501,7 +463,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt
         public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val asString: R|kotlin/String| = R|<local>/asString|
             public [ResolvedTo(STATUS)] [ContainingClassKey=Kind] get(): R|kotlin/String|
 
-        @R|kotlin/Suppress|[Types](String(UNCHECKED_CAST)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun valueOf([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] aConst: R|IrConst<*>|): R|T| {
+        @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun valueOf([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] aConst: R|IrConst<*>|): R|T| {
             ^valueOf (R|<local>/aConst| as R|IrConst<T>|).R|SubstitutionOverride</IrConst.value: R|T|>|
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fakeOverrideScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/fakeOverrideScript.txt
index 5a3969dc52d..9c7263c41c7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fakeOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fakeOverrideScript.txt
@@ -358,51 +358,6 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fakeOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-fakeOverrideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun expression([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] expression: R|IrConst<*>|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
-            protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind<T>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val asString: String = R|<local>/asString|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] get(): String
-
-            @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun valueOf([ResolvedTo(RAW_FIR)] aConst: IrConst<*>): <implicit> { LAZY_BLOCK }
-
-            public? final? [ResolvedTo(RAW_FIR)] object Null : Kind<Nothing?> {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Null] constructor(): R|Kind.Null| {
-                    LAZY_super<Kind<Nothing?>>
-                }
-
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun toString(): <implicit> { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class IrConst<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] constructor<[ResolvedTo(RAW_FIR)] T>(): R|IrConst<T>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] var kind: Kind<T>
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] get(): Kind<T>
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] set([ResolvedTo(RAW_FIR)] value: Kind<T>): R|kotlin/Unit|
-
-            public? abstract [ResolvedTo(RAW_FIR)] var value: T
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] get(): T
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=IrConst] set([ResolvedTo(RAW_FIR)] value: T): R|kotlin/Unit|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fakeOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -590,7 +545,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverrideScript.kts
             public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val asString: R|kotlin/String| = R|<local>/asString|
                 public [ResolvedTo(STATUS)] [ContainingClassKey=Kind] get(): R|kotlin/String|
 
-            @R|kotlin/Suppress|[Types](String(UNCHECKED_CAST)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun valueOf([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] aConst: R|IrConst<*>|): R|T| {
+            @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun valueOf([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] aConst: R|IrConst<*>|): R|T| {
                 ^valueOf (R|<local>/aConst| as R|IrConst<T>|).R|SubstitutionOverride</IrConst.value: R|T|>|
             }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt
index a3f24ee5126..ea96d3efc2e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt
-    public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt
     public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt
index 44ee427f251..e2543bc90c1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-fakePrimaryConstructorScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -221,4 +205,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] fakePrimaryConstructorScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotations.txt
index d7afd664ccd..882c9e3063a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotations.txt
@@ -118,25 +118,10 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotations.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fileAnnotations.kt
-    @FILE:R|kotlin/Deprecated|[Types](String())
-    @FILE:R|one/Anno|[Types](String(anno))
-    [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotations container
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FILE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] fileAnnotations.kt
     @FILE:R|kotlin/Deprecated|[Types](String())
-    @FILE:R|one/Anno|[Types](String(anno))
+    @FILE:R|one/Anno|[Types](LAZY_EXPRESSION)
     [ResolvedTo(CONTRACTS)] annotations container
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FILE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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| {
@@ -151,7 +136,7 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotations.kt
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] fileAnnotations.kt
     @FILE:R|kotlin/Deprecated|[Types](String())
-    @FILE:R|one/Anno|[Types](String(anno))
+    @FILE:R|one/Anno|[Types](LAZY_EXPRESSION)
     [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotations container
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FILE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotationsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotationsScript.txt
index 95e7f076817..c01c86a04ce 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fileAnnotationsScript.txt
@@ -158,30 +158,10 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotationsScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fileAnnotationsScript.kts
-    @FILE:R|kotlin/Deprecated|[Types](String())
-    @FILE:R|one/Anno|[Types](String(anno))
-    [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotations container
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-fileAnnotationsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FILE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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)] fileAnnotationsScript.kts
     @FILE:R|kotlin/Deprecated|[Types](String())
-    @FILE:R|one/Anno|[Types](String(anno))
+    @FILE:R|one/Anno|[Types](LAZY_EXPRESSION)
     [ResolvedTo(CONTRACTS)] annotations container
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(RAW_FIR)] <script-fileAnnotationsScript.kts>
@@ -201,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotationsScript.kts
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] fileAnnotationsScript.kts
     @FILE:R|kotlin/Deprecated|[Types](String())
-    @FILE:R|one/Anno|[Types](String(anno))
+    @FILE:R|one/Anno|[Types](LAZY_EXPRESSION)
     [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotations container
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
     SCRIPT: [ResolvedTo(RAW_FIR)] <script-fileAnnotationsScript.kts>
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fileElements.txt b/analysis/low-level-api-fir/testData/lazyResolve/fileElements.txt
index 36846e37e9e..eb63d5ff912 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fileElements.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fileElements.txt
@@ -310,49 +310,10 @@ FILE: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fileElements.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fileElements.kt
-    @FILE:R|kotlin/Deprecated|[Types](String(deprecated file))
-    @FILE:R|one/Anno|[Types](IntegerLiteral(1))
-    [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotations container
-    public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.i] i: Int): R|one/Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] val a: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val b: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val c: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] fun test1(): R|kotlin/Unit| { LAZY_BLOCK }
-    @Deprecated[Unresolved](String()) @Anno[Unresolved](IntegerLiteral(2)) public? final? [ResolvedTo(RAW_FIR)] fun test2(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun test3(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun test4(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    @Anno[Unresolved](IntegerLiteral(4)) @Deprecated[Unresolved](String()) public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(CONTRACTS)] fileElements.kt
     @FILE:R|kotlin/Deprecated|[Types](String(deprecated file))
-    @FILE:R|one/Anno|[Types](IntegerLiteral(1))
+    @FILE:R|one/Anno|[Types](LAZY_EXPRESSION)
     [ResolvedTo(CONTRACTS)] annotations container
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.i] i: Int): R|one/Anno| {
@@ -370,7 +331,7 @@ FILE: [ResolvedTo(CONTRACTS)] fileElements.kt
     public? final? [ResolvedTo(RAW_FIR)] val c: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] fun test1(): R|kotlin/Unit| { LAZY_BLOCK }
-    @Deprecated[Unresolved](String()) @Anno[Unresolved](IntegerLiteral(2)) public? final? [ResolvedTo(RAW_FIR)] fun test2(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun test2(): R|kotlin/Unit| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
             LAZY_super<R|kotlin/Any|>
@@ -381,7 +342,7 @@ FILE: [ResolvedTo(CONTRACTS)] fileElements.kt
         @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun test4(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
-    @Anno[Unresolved](IntegerLiteral(4)) @Deprecated[Unresolved](String()) public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+    @Anno[Unresolved](LAZY_EXPRESSION) @Deprecated[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -391,7 +352,7 @@ FILE: [ResolvedTo(CONTRACTS)] fileElements.kt
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fileElements.kt
     @FILE:R|kotlin/Deprecated|[Types](String(deprecated file))
-    @FILE:R|one/Anno|[Types](IntegerLiteral(1))
+    @FILE:R|one/Anno|[Types](LAZY_EXPRESSION)
     [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotations container
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.i] i: Int): R|one/Anno| {
@@ -409,7 +370,7 @@ FILE: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fileElements.kt
     public? final? [ResolvedTo(RAW_FIR)] val c: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] fun test1(): R|kotlin/Unit| { LAZY_BLOCK }
-    @Deprecated[Unresolved](String()) @Anno[Unresolved](IntegerLiteral(2)) public? final? [ResolvedTo(RAW_FIR)] fun test2(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun test2(): R|kotlin/Unit| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|one/A| {
             LAZY_super<R|kotlin/Any|>
@@ -420,7 +381,7 @@ FILE: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fileElements.kt
         @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun test4(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
-    @Anno[Unresolved](IntegerLiteral(4)) @Deprecated[Unresolved](String()) public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
+    @Anno[Unresolved](LAZY_EXPRESSION) @Deprecated[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|one/B| {
             LAZY_super<R|kotlin/Any|>
         }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuter.txt b/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuter.txt
index a8571b6f28f..2747cf795db 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuter.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt
-    public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-            LAZY_super<TopLevelClass>
-        }
-
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt
     public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuterScript.txt
index 5fb7537d54a..70c5ccb8440 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/fromLocalHierarchyToOuterScript.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-fromLocalHierarchyToOuterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                LAZY_super<TopLevelClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotations.txt
index c19f646aa93..943e275e0e3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotations.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(EXPECT_ACTUAL_MATCHING)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=myPack/Anno.number] number: Int): R|myPack/Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-    }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val functionProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val parameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
@@ -252,21 +225,21 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
 
     }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val functionProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val parameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val functionProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val parameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(CONTRACTS)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
@@ -279,21 +252,21 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
 
     }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val functionProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val parameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val functionProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val parameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = defaultValueProperty#): R|kotlin/String| {
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = defaultValueProperty#): R|kotlin/String| {
         ^function String(str)
     }
 
@@ -308,19 +281,19 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
             public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
-    @R|myPack/Anno|[Types](functionProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](parameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](valueParameterTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @R|myPack/Anno|[Types](number = R|myPack/functionProperty|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  kotlin/Int|.function([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @R|myPack/Anno|[Types](number = R|myPack/parameterProperty|) param: R|@R|myPack/Anno|(number = R|myPack/valueParameterTypeProperty|)  kotlin/Int| = defaultValueProperty#): R|kotlin/String| {
         ^function String(str)
@@ -337,19 +310,19 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
             public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
-    @R|myPack/Anno|[Types](functionProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](parameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](defaultValueProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val defaultValueProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val defaultValueProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](valueParameterTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @R|myPack/Anno|[Types](number = R|myPack/functionProperty|) public final [ResolvedTo(BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  kotlin/Int|.function([ResolvedTo(BODY_RESOLVE)] @R|myPack/Anno|[Types](number = R|myPack/parameterProperty|) param: R|@R|myPack/Anno|(number = R|myPack/valueParameterTypeProperty|)  kotlin/Int| = R|myPack/defaultValueProperty|): R|kotlin/String| {
         ^function String(str)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotationsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotationsScript.txt
index dc7623425b9..fd4faa8c98c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotationsScript.txt
@@ -318,46 +318,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
         @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(EXPECT_ACTUAL_MATCHING)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionWithImplicitTypeAndAnnotationsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=myPack/Anno.number] number: Int): R|myPack/Anno| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-        }
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val functionProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val parameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -374,28 +334,28 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val functionProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val functionProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val parameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val parameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
         @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(CONTRACTS)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -414,28 +374,28 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val functionProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val functionProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val parameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val parameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
         @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = defaultValueProperty#): R|kotlin/String| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  kotlin/Int|.function([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) param: R|@R|myPack/Anno|(valueParameterTypeProperty#)  kotlin/Int| = defaultValueProperty#): R|kotlin/String| {
             ^function String(str)
         }
 
@@ -456,25 +416,25 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](functionProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](parameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val defaultValueProperty: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](valueParameterTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @R|myPack/Anno|[Types](number = R|myPack/functionProperty|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  kotlin/Int|.function([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @R|myPack/Anno|[Types](number = R|myPack/parameterProperty|) param: R|@R|myPack/Anno|(number = R|myPack/valueParameterTypeProperty|)  kotlin/Int| = defaultValueProperty#): R|kotlin/String| {
@@ -498,25 +458,25 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](functionProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val functionProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](parameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val parameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](defaultValueProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val defaultValueProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val defaultValueProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](valueParameterTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueParameterTypeProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @R|myPack/Anno|[Types](number = R|myPack/functionProperty|) public final [ResolvedTo(BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  kotlin/Int|.function([ResolvedTo(BODY_RESOLVE)] @R|myPack/Anno|[Types](number = R|myPack/parameterProperty|) param: R|@R|myPack/Anno|(number = R|myPack/valueParameterTypeProperty|)  kotlin/Int| = R|myPack/defaultValueProperty|): R|kotlin/String| {
@@ -564,4 +524,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] functionWithImplicitTypeAndAnnotationsScript.kt
         @R|myPack/Anno|[Types](number = R|myPack/functionProperty|) public final [ResolvedTo(BODY_RESOLVE)] fun <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  kotlin/Int|.function([ResolvedTo(BODY_RESOLVE)] @R|myPack/Anno|[Types](number = R|myPack/parameterProperty|) param: R|@R|myPack/Anno|(number = R|myPack/valueParameterTypeProperty|)  kotlin/Int| = R|myPack/defaultValueProperty|): R|kotlin/String| {
             ^function String(str)
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValue.txt b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValue.txt
index be9d12e515a..e7cfd725bf0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValue.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValue.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndStringTemplateAsDefaultVa
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun topLevelFunction([ResolvedTo(EXPECT_ACTUAL_MATCHING)] firstParam: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] secondParam: R|kotlin/String| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndStringTemplateAsDefaultValue.kt
-    public? final? const [ResolvedTo(RAW_FIR)] val myNumber: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun topLevelFunction([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] firstParam: R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] secondParam: R|kotlin/String| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndStringTemplateAsDefaultValue.kt
     public? final? const [ResolvedTo(RAW_FIR)] val myNumber: <implicit> = LAZY_EXPRESSION
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.txt
index 8b62b70a469..3d4b07dd5d3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndStringTemplateAsDefaultVa
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun topLevelFunction([ResolvedTo(EXPECT_ACTUAL_MATCHING)] firstParam: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] secondParam: R|kotlin/String| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? const [ResolvedTo(RAW_FIR)] val myNumber: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun topLevelFunction([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] firstParam: R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] secondParam: R|kotlin/String| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndStringTemplateAsDefaultValueScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -172,4 +160,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] functionWithImplicitTypeAndStringTemplateAsDefa
         public final [ResolvedTo(BODY_RESOLVE)] fun topLevelFunction([ResolvedTo(BODY_RESOLVE)] firstParam: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] secondParam: R|kotlin/String| = <strcat>(String(My str ), R|<local>/firstParam|.R|kotlin/Int.plus|(R|myPack/myNumber|).R|kotlin/Int.toString|())): R|kotlin/Int| {
             ^topLevelFunction Int(42)
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameter.txt
index ac9a16f7674..8927005b625 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameter.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|I|): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt
-    public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|I|): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt
     public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameterScript.txt
index ea575bbed41..c251090cc52 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functionWithParameterScript.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|I|): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionWithParameterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| {
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|I|): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -172,4 +160,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] functionWithParameterScript.kts
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe([ResolvedTo(BODY_RESOLVE)] param: R|I|): R|kotlin/Unit| {
             ^resolveMe Q|kotlin/Unit|
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.out_of_src_roots.txt
index c980c323181..548136b1592 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.out_of_src_roots.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] contract.kt
     public final inline [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] contract.kt
-    public final inline [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] contract.kt
     public final inline [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.txt
index 132a5ab7d0b..efc05a76e21 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/contract.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] contract.kt
     public final inline [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] contract.kt
-    public final inline [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] contract.kt
     public final inline [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] block: R|() -> kotlin/Unit|): R|kotlin/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 b793fa05c05..e3a2934ebc2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/contractScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/contractScript.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] contractScript.kts
         public final inline [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] contractScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-contractScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final inline [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 8ac6cbe688b..c92aad6aacf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/contractScript2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/contractScript2.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
         public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-contractScript2.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionCallWithGenericResult.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionCallWithGenericResult.txt
index 158e9755e9f..ce3c585804c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionCallWithGenericResult.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionCallWithGenericResult.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
     public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? { LAZY_BLOCK }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
-    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>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
     public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
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 3e561fb9f27..f84e0bc6abf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionCallWithGenericResultScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionCallWithGenericResultScript.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionCallWithGenericResultScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar(): Foo<String>? { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionParameter.txt
index 7e4b2fb7e6e..ea1086f1458 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionParameter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionParameter.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionParameter.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|kotlin/Int|): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionParameter.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|kotlin/Int|): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionParameter.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] param: R|kotlin/Int|): <implicit> { LAZY_BLOCK }
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 2073fbd27e9..4510a8a58f1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionParameterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionParameterScript.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|kotlin/Int|): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionParameterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|kotlin/Int|): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -130,4 +121,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] functionParameterScript.kts
         public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/Int|): R|kotlin/String| {
             ^foo String(boo)
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt
index 6f360126a07..c5f282f6da5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt
@@ -134,23 +134,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt
     public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> { LAZY_BLOCK }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt
-    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>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-            LAZY_super<<implicit>>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt
     public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
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 4a92b9f3500..aaa9f766e41 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionWithGenericExpectedTypeInsideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class Bar : Foo<String> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Bar] constructor(): R|Bar| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithTypeParameters.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithTypeParameters.txt
index 82cea802a03..3bb2aac1e76 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithTypeParameters.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithTypeParameters.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt
     public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> resolveMe(): R|kotlin/Unit| {
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 2243c49b8cf..e49b7a82bcd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/functionWithTypeParametersScript.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-functionWithTypeParametersScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverride.txt
index a56e037feea..c5d833d909f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverride.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/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 abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
-
-    }
-    public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-            LAZY_super<<implicit>>
-        }
-
-        public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt
index 3feada2eb39..647a90cb58e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-        public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt
index 0be9a1ef634..b1b2ab2910c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-        public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<R|OuterClass.NestedClass|>
-            }
-
-            public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun bar([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 d9de562b731..ee544f565ef 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass2Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<R|OuterClass.NestedClass|>
-                }
-
-                public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun bar([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt
index a8ce827d073..acb16f54979 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt
@@ -558,76 +558,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 8b36039a1a7..60923e8e0cb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass3Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 30e814acf3b..8130b35d075 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
@@ -622,84 +622,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClassScript.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 fd8bde5e852..ef76366bd58 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/hierarchyWithOverrideScript.txt
@@ -286,42 +286,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideScript.kts>
-        [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 abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/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 abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                LAZY_super<<implicit>>
-            }
-
-            public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride.txt
index 9c7fed5a74c..81ba25259df 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-        public abstract override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2.txt
index c1805439a91..b5464110d76 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2Script.txt
index b5ed10968b2..1e8aada9866 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverride2Script.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-simpleLoopInOverride2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-            public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverrideScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverrideScript.txt
index 33c56aad4be..e96d551eea5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/simpleLoopInOverrideScript.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-simpleLoopInOverrideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-            public abstract override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/typeArgumentInAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/typeArgumentInAnnotation.txt
index 8bd14b69665..ed30db013ba 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/typeArgumentInAnnotation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/typeArgumentInAnnotation.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] typeArgumentInAnnotation.kt
     }
     @R|Foo<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeArgumentInAnnotation.kt
-    public? final? [ResolvedTo(RAW_FIR)] annotation class Foo<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Foo.s] s: String): R|Foo<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] get(): String
-
-    }
-    @R|Foo<kotlin/Int>|[Types](String()) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeArgumentInAnnotation.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Foo<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Annotation| {
@@ -126,7 +113,7 @@ FILE: [ResolvedTo(IMPORTS)] typeArgumentInAnnotation.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] get(): String
 
     }
-    @R|Foo<kotlin/Int>|[Types](String()) public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
+    @R|Foo<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -140,7 +127,7 @@ FILE: [ResolvedTo(IMPORTS)] typeArgumentInAnnotation.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] get(): String
 
     }
-    @R|Foo<kotlin/Int>|[Types](String()) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
+    @R|Foo<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/unresolvedAnnotationOnFunctionType.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/unresolvedAnnotationOnFunctionType.txt
index af2d580e932..902fba336ab 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/unresolvedAnnotationOnFunctionType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/unresolvedAnnotationOnFunctionType.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnFunctionType.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] a: <ERROR TYPE REF: Symbol not found for Foo>): <ERROR TYPE REF: Symbol not found for Foo> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnFunctionType.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: <ERROR TYPE REF: Symbol not found for Foo>): <ERROR TYPE REF: Symbol not found for Foo> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnFunctionType.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] a: <ERROR TYPE REF: Symbol not found for Foo>): <ERROR TYPE REF: Symbol not found for Foo> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.out_of_src_roots.txt
index 209594869d0..41017283bb0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.out_of_src_roots.txt
@@ -62,14 +62,6 @@ FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithRawContract.kt
         >
      { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithRawContract.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] bool: R|kotlin/Boolean|): <implicit>
-        [Contract description] <
-            LAZY_EXPRESSION
-        >
-     { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithRawContract.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] bool: R|kotlin/Boolean|): <implicit> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.txt b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.txt
index dc81183b09c..5d24b750531 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithRawContract.txt
@@ -62,14 +62,6 @@ FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithRawContract.kt
         >
      { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithRawContract.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] bool: R|kotlin/Boolean|): <implicit>
-        [Contract description] <
-            LAZY_EXPRESSION
-        >
-     { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithRawContract.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] bool: R|kotlin/Boolean|): <implicit>
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithUnresolvedRawContract.txt b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithUnresolvedRawContract.txt
index 8217e0e67fe..f988dc6dd57 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithUnresolvedRawContract.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithUnresolvedRawContract.txt
@@ -62,14 +62,6 @@ FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithUnresolvedRawContract.kt
         >
      { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithUnresolvedRawContract.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] bool: R|kotlin/Boolean|): <implicit>
-        [Contract description] <
-            LAZY_EXPRESSION
-        >
-     { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithUnresolvedRawContract.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] bool: R|kotlin/Boolean|): <implicit> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.out_of_src_roots.txt
index b6a1babd0cb..ef69c7898fe 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.out_of_src_roots.txt
@@ -62,14 +62,6 @@ FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithWrongRawContract.kt
         >
      { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithWrongRawContract.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] bool: R|kotlin/Boolean|): <implicit>
-        [Contract description] <
-            LAZY_EXPRESSION
-        >
-     { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithWrongRawContract.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] bool: R|kotlin/Boolean|): <implicit> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.txt b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.txt
index 2a41a12620b..ee46fbfd159 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/implicitTypeOnFunctionWithWrongRawContract.txt
@@ -62,14 +62,6 @@ FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithWrongRawContract.kt
         >
      { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithWrongRawContract.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] bool: R|kotlin/Boolean|): <implicit>
-        [Contract description] <
-            LAZY_EXPRESSION
-        >
-     { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] implicitTypeOnFunctionWithWrongRawContract.kt
     public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] bool: R|kotlin/Boolean|): <implicit>
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterface.txt b/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterface.txt
index 77d2dca06ba..a74a0055d03 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterface.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterface.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt
     public? final? [ResolvedTo(RAW_FIR)] fun testMe([ResolvedTo(RAW_FIR)] f: Foo): R|kotlin/Unit| { LAZY_BLOCK }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt
-    public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    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: Foo): R|kotlin/Unit| { LAZY_BLOCK }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt
     public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterfaceScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterfaceScript.txt
index b7f3f7ab144..48200d150d6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterfaceScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/lambdaAsSAMInterfaceScript.txt
@@ -182,29 +182,6 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-lambdaAsSAMInterfaceScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        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: Foo): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt
index 85302d3e2e9..b90507dc270 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
-    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>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T { LAZY_BLOCK }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
-    public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
     public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt
index bb18bb32512..5f0ad458cdc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt
@@ -294,43 +294,6 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-lazyPropertyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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(RAW_FIR)] fun getValue([ResolvedTo(RAW_FIR)] thisRef: Any?, [ResolvedTo(RAW_FIR)] property: KProperty<*>): T { LAZY_BLOCK }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> lazy([ResolvedTo(RAW_FIR)] block: ( () -> T )): LazyDelegate<T> { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun getAny(): Any? { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
-
-        public final [ResolvedTo(STATUS)] class Test : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] constructor(): R|Test| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -532,4 +495,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] lazyPropertyScript.kts
                 }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/localConstructor.txt
index 56f90300af9..2fb2a69614b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localConstructor.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
-    public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK }
-    public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] E, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] F> foo(): <implicit> { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
     public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localConstructorScript.txt
index a129a08b96b..4e19d973aa4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localConstructorScript.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localConstructorScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK }
-
-        public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] E, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] F> foo(): <implicit> { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -340,4 +322,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localConstructorScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCall.txt
index 5a125ead93b..0399c31d933 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCall.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCall.txt
@@ -158,26 +158,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt
-    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| {
-            LAZY_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|
-
-    }
-    @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-    }
-    .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt
     public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCallScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCallScript.txt
index 5564ca0f2eb..9f8f361d1b0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCallScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideAnnotationCallScript.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localFunctionInsideAnnotationCallScript.kts>
-        [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| {
-                LAZY_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|
-
-        }
-
-        @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-        }
-        .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideFunctionLiteral.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideFunctionLiteral.txt
index 4f41e4d73ae..16b56573b1b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideFunctionLiteral.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideFunctionLiteral.txt
@@ -158,26 +158,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt
-    public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-        public [ResolvedTo(BODY_RESOLVE)] [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| {
-                }
-
-            }
-            )
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt
     public open [ResolvedTo(STATUS)] class ClassWithParameter : 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 8b697c00d0b..6e5cebaff09 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localFunctionInsideFunctionLiteralScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(BODY_RESOLVE)] [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| {
-                    }
-
-                }
-                )
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt
index be61fc6138b..0aa276713d3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt
-    public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-        public [ResolvedTo(BODY_RESOLVE)] [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)
-                }
-
-                ^ R|<local>/str|()
-            }
-            .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt
     public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
index a36eb7a1856..6b856311ace 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScr
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localFunctionInsideLambdaCallInsideStringTemplateScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(BODY_RESOLVE)] [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)
-                    }
-
-                    ^ R|<local>/str|()
-                }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStatement.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStatement.txt
index ed4235d04bd..67794098412 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStatement.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStatement.txt
@@ -342,49 +342,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
             public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] <script-localFunctionInsideStatement.kts>
-        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
-
-            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
-                println#(version#)
-            }
-
-        }
-
-        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
-        }
-
-        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [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(BODY_RESOLVE)] class A : R|kotlin/Any| {
-                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|<local>/A| {
-                    super<R|kotlin/Any|>()
-                }
-
-                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
-                }
-
-            }
-
-            this@R|special/anonymous|.R|/Builder.execute|()
-        }
-        )
-            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplate.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplate.txt
index b534d7cb76f..3bee4b38862 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplate.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplate.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt
-    public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-            super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                ^ String()
-            }
-            .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt
     public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplateScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplateScript.txt
index d34d0598494..973a729b699 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideStringTemplateScript.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localFunctionInsideStringTemplateScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(<strcat>([ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/String| <inline=Unknown>  {
-                    ^ String()
-                }
-                .R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/String|>|()))
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt
index f4783790d15..e3669af5d34 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt
-    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 open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-            super<R|one/ClassWithParameter|>(object : R|one/Interface| {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|one/<anonymous>| {
-                    super<R|kotlin/Any|>()
-                }
-
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
-                }
-
-            }
-            )
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt
     public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
index 0b7914e9149..09c966b77ef 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
@@ -278,41 +278,6 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localFunctionInsideSuperEntryCallScript.kts>
-        [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 open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
-                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|one/<anonymous>| {
-                        super<R|kotlin/Any|>()
-                    }
-
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
-                    }
-
-                }
-                )
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localNestedClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/localNestedClass.txt
index a8577c7d873..b9f6d9969a8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localNestedClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localNestedClass.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt
-    public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-            LAZY_super<TopLevelClass>
-        }
-
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt
     public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localNestedClassScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localNestedClassScript.txt
index 51226c308bb..b6af793568e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localNestedClassScript.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localNestedClassScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? open [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public? open [ResolvedTo(RAW_FIR)] fun boo([ResolvedTo(RAW_FIR)] b: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
-                LAZY_super<TopLevelClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt
index 02c5881fda8..103adc69d6f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt
-    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 open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-            super<R|one/ClassWithParameter|>(object : R|one/Interface| {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|one/<anonymous>| {
-                    super<R|kotlin/Any|>()
-                }
-
-                public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
-                }
-
-            }
-            )
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt
     public abstract [ResolvedTo(STATUS)] interface Interface : 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 a8c6f0a1695..3790d450d13 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCallScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCallScript.txt
@@ -278,41 +278,6 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-localParameterInsideSuperEntryCallScript.kts>
-        [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 open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|one/Interface|): R|one/ClassWithParameter| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| {
-            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| {
-                super<R|one/ClassWithParameter|>(object : R|one/Interface| {
-                    private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|one/<anonymous>| {
-                        super<R|kotlin/Any|>()
-                    }
-
-                    public open override [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: R|kotlin/String|): R|kotlin/Unit| {
-                    }
-
-                }
-                )
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotations.txt
index c49edb7be78..26a9e86dfc2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotations.txt
@@ -486,67 +486,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(FirstClass)) @R|Anno|[Types](String(FirstClass)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class FirstClass : R|kotlin/Any| {
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.NestedClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass.NestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): Int
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? companion [ResolvedTo(RAW_FIR)] object Companion : R|kotlin/Any| {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Companion] constructor(): R|FirstClass.Companion| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Companion] get(): <implicit>
-
-        }
-
-    }
-    @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -558,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](String(FirstClass)) public final [ResolvedTo(CONTRACTS)] class FirstClass : R|kotlin/Any| {
+    @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class FirstClass : R|kotlin/Any| {
         @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -619,7 +558,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](String(FirstClass)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class FirstClass : R|kotlin/Any| {
+    @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class FirstClass : R|kotlin/Any| {
         @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass| {
             LAZY_super<R|kotlin/Any|>
         }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt
index 086eeadd6a1..1177a54dc69 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt
@@ -486,67 +486,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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](String(FirstClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] class FirstClass : R|kotlin/Any| {
-        @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/FirstClass.a] @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|FirstClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
-
-        @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=FirstClass] get(): <implicit>
-
-        @R|kotlin/Deprecated|[Types](String(NestedClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/FirstClass.NestedClass.a] @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|FirstClass.NestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Int|
-
-            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](String(memberFunction)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-        }
-
-        @R|kotlin/Deprecated|[Types](String(companion)) @R|Anno|[Types](LAZY_EXPRESSION) public final companion [ResolvedTo(STATUS)] object Companion : R|kotlin/Any| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|FirstClass.Companion| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
-
-        }
-
-    }
-    @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@@ -579,7 +518,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt
             @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
                 public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Int|
 
-            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](String(memberFunction)) public final [ResolvedTo(CONTRACTS)] fun memberFunction(): R|kotlin/Unit| {
+            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun memberFunction(): R|kotlin/Unit| {
             }
 
             @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
@@ -641,7 +580,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt
             @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
                 public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Int|
 
-            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](String(memberFunction)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun memberFunction(): R|kotlin/Unit| {
+            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun memberFunction(): R|kotlin/Unit| {
             }
 
             @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt
index dd919569130..1acdf782d62 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt
@@ -542,74 +542,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMemberScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMemberScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedCompilerRequiredAnnotationsForMemberScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(FirstClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] class FirstClass : R|kotlin/Any| {
-            @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/FirstClass.a] @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|FirstClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=FirstClass] get(): R|kotlin/Int|
-
-            @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=FirstClass] get(): <implicit>
-
-            @R|kotlin/Deprecated|[Types](String(NestedClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] class NestedClass : R|kotlin/Any| {
-                @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/FirstClass.NestedClass.a] @R|Anno|[Types](LAZY_EXPRESSION) a: R|kotlin/Int|): R|FirstClass.NestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Int|
-
-                @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](String(memberFunction)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-            }
-
-            @R|kotlin/Deprecated|[Types](String(companion)) @R|Anno|[Types](LAZY_EXPRESSION) public final companion [ResolvedTo(STATUS)] object Companion : R|kotlin/Any| {
-                private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|FirstClass.Companion| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
-
-            }
-
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMemberScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -647,7 +579,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMemberScript.kts
                 @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
                     public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Int|
 
-                @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](String(memberFunction)) public final [ResolvedTo(CONTRACTS)] fun memberFunction(): R|kotlin/Unit| {
+                @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
                 @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
@@ -716,7 +648,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMemberScript.kts
                 @R|kotlin/Deprecated|[Types](String(constructorProperty)) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val a: R|kotlin/Int| = R|<local>/a|
                     public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): R|kotlin/Int|
 
-                @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](String(memberFunction)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun memberFunction(): R|kotlin/Unit| {
+                @R|kotlin/Deprecated|[Types](String(memberFunction)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun memberFunction(): R|kotlin/Unit| {
                 }
 
                 @R|kotlin/Deprecated|[Types](String(memberProperty)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit> = LAZY_EXPRESSION
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt
index 03cb664fac7..e16f949277c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt
-    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| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun test(): R|kotlin/Unit| { LAZY_BLOCK }
-    @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt
     public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
index f926632006d..18e768f151c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kt
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedCompilerRequiredAnnotationsInsideBodyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun test(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt
index bd297c5bdbd..c97d636833e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt
@@ -542,74 +542,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedCompilerRequiredAnnotationsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            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](String(FirstClass)) @R|Anno|[Types](String(FirstClass)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class FirstClass : R|kotlin/Any| {
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): Int
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] get(): <implicit>
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
-                @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.NestedClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass.NestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|<local>/a|
-                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): Int
-
-                @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? companion [ResolvedTo(RAW_FIR)] object Companion : R|kotlin/Any| {
-                private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Companion] constructor(): R|FirstClass.Companion| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit> = LAZY_EXPRESSION
-                    public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Companion] get(): <implicit>
-
-            }
-
-        }
-
-        @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class AnotherClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherClass] constructor(): R|AnotherClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -626,7 +558,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](String(FirstClass)) public final [ResolvedTo(CONTRACTS)] class FirstClass : R|kotlin/Any| {
+        @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] class FirstClass : R|kotlin/Any| {
             @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -694,7 +626,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsScript.kts
 
         }
 
-        @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](String(FirstClass)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class FirstClass : R|kotlin/Any| {
+        @R|kotlin/Deprecated|[Types](String(FirstClass)) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class FirstClass : R|kotlin/Any| {
             @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=FirstClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/FirstClass.a] @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) a: Int): R|FirstClass| {
                 LAZY_super<R|kotlin/Any|>
             }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias.txt
index 30cc58d506b..eff87d1a25f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias.txt
@@ -238,36 +238,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt
-    public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
-            LAZY_super<R|SuperForOuter|>
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] class NestedClass<[ResolvedTo(SUPER_TYPES)] T2> : R|Another| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(SUPER_TYPES)] T2>(): R|OuterClass.NestedClass<T2>| {
-                LAZY_super<Another>
-            }
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias NestedType<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> = R|OuterClass.NestedClass<T>|
-
-    }
-    public? open [ResolvedTo(SUPER_TYPES)] class Another : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Another] constructor(): R|Another| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public open [ResolvedTo(STATUS)] class SuperForOuter : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=SuperForOuter] constructor(): R|SuperForOuter| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt
     public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2.txt
index 32a867e44e3..7bb4677b96a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias ON3<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T2> = R|OuterClass.NestedType<T2>|
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt
-    public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass<T1>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] class NestedClass<[ResolvedTo(SUPER_TYPES)] T2> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(SUPER_TYPES)] T2>(): R|OuterClass.NestedClass<T2>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final [ResolvedTo(SUPER_TYPES)] typealias NestedType<[ResolvedTo(SUPER_TYPES)] T> = R|OuterClass.NestedClass<T>|
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias ON3<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T2> = R|OuterClass.NestedType<T2>|
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt
     public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2Script.txt
index 4cc87181c18..272d8c77293 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAlias2Script.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias ON3<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T2> = R|OuterClass.NestedType<T2>|
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedTypeAlias2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass<T1>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(SUPER_TYPES)] class NestedClass<[ResolvedTo(SUPER_TYPES)] T2> : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(SUPER_TYPES)] T2>(): R|OuterClass.NestedClass<T2>| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-            public? final [ResolvedTo(SUPER_TYPES)] typealias NestedType<[ResolvedTo(SUPER_TYPES)] T> = R|OuterClass.NestedClass<T>|
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias ON3<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T2> = R|OuterClass.NestedType<T2>|
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAliasScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAliasScript.txt
index df5bda7dd47..ced69f2f538 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/nestedTypeAliasScript.txt
@@ -294,43 +294,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAliasScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] nestedTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-nestedTypeAliasScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass<T1>| {
-                LAZY_super<R|SuperForOuter|>
-            }
-
-            public? final? [ResolvedTo(SUPER_TYPES)] class NestedClass<[ResolvedTo(SUPER_TYPES)] T2> : R|Another| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor<[ResolvedTo(SUPER_TYPES)] T2>(): R|OuterClass.NestedClass<T2>| {
-                    LAZY_super<Another>
-                }
-
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias NestedType<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> = R|OuterClass.NestedClass<T>|
-
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class Another : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Another] constructor(): R|Another| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public open [ResolvedTo(STATUS)] class SuperForOuter : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=SuperForOuter] constructor(): R|SuperForOuter| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAliasScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.out_of_src_roots.txt
index 1bcbc027e5f..40a3372ba26 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.out_of_src_roots.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] arrayOfCall.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] arrayOfCall.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class Ann : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Ann.a] vararg a: String = LAZY_EXPRESSION): R|Ann| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true, IsFromVarargKey=true] val a: String = R|<local>/a|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] get(): String
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] arrayOfCall.kt
     public final [ResolvedTo(CONTRACTS)] annotation class Ann : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.txt
index 52263d9567d..ec80ea39501 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/arrayOfCall.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] arrayOfCall.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] arrayOfCall.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class Ann : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Ann.a] vararg a: String = LAZY_EXPRESSION): R|Ann| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true, IsFromVarargKey=true] val a: String = R|<local>/a|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] get(): String
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] arrayOfCall.kt
     public final [ResolvedTo(CONTRACTS)] annotation class Ann : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/integerLiteralCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/integerLiteralCall.txt
index a5f26d9c994..97d8b1742bf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/integerLiteralCall.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/noRuntime/integerLiteralCall.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] integerLiteralCall.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] integerLiteralCall.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] integerLiteralCall.kt
     public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetter.txt
index 253384ed366..992d5c924f1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetter.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt
-    public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int| = LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=X] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt
     public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetterScript.txt
index 43f4e84ead2..85c30e2bf8c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfNonLocalSetterScript.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-parameterOfNonLocalSetterScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int| = LAZY_EXPRESSION
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=X] get(): R|kotlin/Int|
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=X] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetter.txt
index 18502104ef6..1c1ad7e672b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetter.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int| = LAZY_EXPRESSION
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt
     public final [ResolvedTo(CONTRACTS)] var x: R|kotlin/Int| = IntegerLiteral(2)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetterScript.txt
index 904b3bca2ea..fb12d7f5f5b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/parameterOfTopSetterScript.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-parameterOfTopSetterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int| = LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt
index ea36d61d3e3..aeacb7e88da 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt
-    public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt
     public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameter.txt
index db95e1abab2..c5465e56895 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameter.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt
-    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: R|kotlin/Boolean|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] c: R|kotlin/Long|): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(STATUS)] fun foo(): <implicit> { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt
index f09bb137345..60e76b913c4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorParameterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: R|kotlin/Boolean|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] c: R|kotlin/Long|): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(STATUS)] fun foo(): <implicit> { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -222,4 +206,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorParameterScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt
index 74ad51dbf3d..2610ecdcbc5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt
-    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: R|kotlin/Boolean|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| {
-            LAZY_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(STATUS)] fun foo(): <implicit> { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt
index eb49f967800..6c71c6df1b8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorPropertyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: R|kotlin/Boolean|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| {
-                LAZY_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(STATUS)] fun foo(): <implicit> { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -264,4 +245,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorPropertyScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt
index 3693b3f9940..13c8c7ed8d1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| {
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -221,4 +205,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegation.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegation.txt
index 485b8ff943f..ab713405076 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegation.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
-    public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun getValue(): <implicit> { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public final [ResolvedTo(CONTRACTS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegationScript.txt
index d9f4a023420..5888accbdfc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegationScript.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-getterWithDelegationScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
-
-        public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun getValue(): <implicit> { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -294,4 +273,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] getterWithDelegationScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverride.txt
index e41e8019e4c..55777ca76ce 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverride.txt
@@ -254,38 +254,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/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 abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
-
-    }
-    public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-            LAZY_super<<implicit>>
-        }
-
-        public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val str: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Usage] get(): <implicit>
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt
index ffd72e69479..8db936e0f5e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt
@@ -582,79 +582,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val st: R|kotlin/String| = LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt
index 28f2a1d876c..2ede1a746cc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt
@@ -582,79 +582,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-        public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val isBoo: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 f72c38c0475..44c9125b20a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -646,87 +646,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass2Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val isBoo: <implicit> = LAZY_EXPRESSION
-                    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt
index 71f9553d5d0..fbcf24f1b9b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt
@@ -582,79 +582,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            private final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val myProp: <implicit> = LAZY_EXPRESSION
-                private [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<NestedClass>
-            }
-
-            public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 947d40f03b0..3faaa187cb2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -646,87 +646,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass3Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public final [ResolvedTo(STATUS)] class SimpleNestedClass : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                private final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val myProp: <implicit> = LAZY_EXPRESSION
-                    private [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=SimpleNestedClass] get(): <implicit>
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt
index bb9a99909c0..16589caa3d1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt
@@ -606,82 +606,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-        public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-        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| {
-            LAZY_super<<implicit>>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                LAZY_super<<implicit>>
-            }
-
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public final [ResolvedTo(STATUS)] val st: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                LAZY_super<R|OuterClass.NestedClass|>
-            }
-
-            public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val isBoo: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| {
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 28efc2b9309..d3b34292d7b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
@@ -670,90 +670,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClass4Script.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] interface Foo2 : R|Foo1| {
-            public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/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)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public abstract [ResolvedTo(STATUS)] class NestedClass : R|Foo2| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-                public final [ResolvedTo(STATUS)] val st: <implicit> = LAZY_EXPRESSION
-                    public [ResolvedTo(STATUS)] [ContainingClassKey=NestedClass] get(): <implicit>
-
-            }
-
-            public abstract [ResolvedTo(STATUS)] class AnotherNestedClass : R|OuterClass.NestedClass| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<R|OuterClass.NestedClass|>
-                }
-
-                public open override [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-                public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val isBoo: <implicit> = LAZY_EXPRESSION
-                    public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=AnotherNestedClass] get(): <implicit>
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 fd2884f98ab..3eee7b3204a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
@@ -646,87 +646,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideAndNestedClassScript.kts>
-        [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 abstract [ResolvedTo(STATUS)] 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)] class ClassFromInterface : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ClassFromInterface] constructor(): R|Foo1.ClassFromInterface| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] val isBoo: Boolean
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): Boolean
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
-
-            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| {
-                LAZY_super<<implicit>>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val st: R|kotlin/String| = LAZY_EXPRESSION
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=OuterClass] get(): R|kotlin/String|
-
-            public? final? [ResolvedTo(RAW_FIR)] class SimpleNestedClass : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SimpleNestedClass] constructor(): R|OuterClass.SimpleNestedClass| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-                public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class NestedClass : Foo2 {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
-                    LAZY_super<<implicit>>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-            public? abstract [ResolvedTo(RAW_FIR)] class AnotherNestedClass : NestedClass {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherNestedClass] constructor(): R|OuterClass.AnotherNestedClass| {
-                    LAZY_super<NestedClass>
-                }
-
-                public? open? override [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 e410e8087a2..d8db78c9a87 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/hierarchyWithOverrideScript.txt
@@ -310,45 +310,6 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideScript.kts>
-        [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 abstract [ResolvedTo(STATUS)] fun bar(): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] val str: R|kotlin/String|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/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 abstract [ResolvedTo(STATUS)] fun bar([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(STATUS)] val isBoo: R|kotlin/Boolean|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Foo2] get(): R|kotlin/Boolean|
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class Usage : R|Foo2| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor(): R|Usage| {
-                LAZY_super<<implicit>>
-            }
-
-            public open override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-            public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val str: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Usage] get(): <implicit>
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitType.txt
index cb2152e9bc2..2343700d54d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitType.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: R|kotlin/Int|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: R|kotlin/Int|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt
     public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/Int|
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt
index 7324d3c5e27..d5c9d14af9f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: R|kotlin/Int|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: R|kotlin/Int|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt
     public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/Int|
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 355a45d4bd6..1b7454d1bf9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
@@ -78,16 +78,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyGetterWithExplicitTypeAndBodyScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: R|kotlin/Int|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
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 76656b15c10..2dd9c9200df 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
@@ -78,16 +78,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyGetterWithExplicitTypeScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: R|kotlin/Int|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithImplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithImplicitType.txt
index 8056e20bf6e..d3e5cefefd9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithImplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithImplicitType.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: <implicit>
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: <implicit>
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt
     public final [ResolvedTo(CONTRACTS)] val prop: <implicit>
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 7af7ac3f14b..0ef324fe0db 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
@@ -78,16 +78,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyGetterWithImplicitTypeScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: <implicit>
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertySetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertySetter.txt
index 0375b471f4b..7909f10f89a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertySetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertySetter.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] propertySetter.kt
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit>
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertySetter.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit>
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertySetter.kt
     public final [ResolvedTo(CONTRACTS)] var prop: <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 df5778adbc2..2f175359d48 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertySetterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertySetterScript.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertySetterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var prop: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit>
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyWithTypeParameters.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyWithTypeParameters.txt
index 3d9ca990eeb..c1db93d24eb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyWithTypeParameters.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyWithTypeParameters.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> R|T|.resolveMe: R|K|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|K| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> R|T|.resolveMe: R|K|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|K| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt
     public final [ResolvedTo(CONTRACTS)] val <[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> R|T|.resolveMe: R|K|
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 5ce0a88addf..e33e7e89526 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/propertyWithTypeParametersScript.txt
@@ -78,16 +78,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|K| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyWithTypeParametersScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> R|T|.resolveMe: R|K|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|K| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride.txt
index 0e858130fa8..0b5c7d94c40 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-        public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val str: R|kotlin/String|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        public? open? override [ResolvedTo(RAW_FIR)] val str: String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        public? open? override [ResolvedTo(RAW_FIR)] val str: String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): String
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2.txt
index a8ac14e775d..2438ef2cd4b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2.txt
@@ -190,30 +190,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
-    public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-        public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val str: R|kotlin/String|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        public? open? override [ResolvedTo(RAW_FIR)] val str: String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
-
-    }
-    public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-        public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-        public? open? override [ResolvedTo(RAW_FIR)] val str: String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): String
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
     public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2Script.txt
index 7dc8bbcaa56..93ff0c5d25d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverride2Script.txt
@@ -246,37 +246,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-simpleLoopInOverride2Script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-            public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val str: R|kotlin/String|
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-            public? open? override [ResolvedTo(RAW_FIR)] val str: String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-            public? open? override [ResolvedTo(RAW_FIR)] val str: String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): String
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverrideScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverrideScript.txt
index 1274023a347..5dc6708c8b1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/simpleLoopInOverrideScript.txt
@@ -246,37 +246,6 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-simpleLoopInOverrideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(STATUS)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
-            public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit|
-
-            public abstract override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val str: R|kotlin/String|
-                public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-            public? open? override [ResolvedTo(RAW_FIR)] val str: String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
-
-        }
-
-        public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
-            public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
-
-            public? open? override [ResolvedTo(RAW_FIR)] val str: String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo3] get(): String
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/unresolvedAnnotationOnPropertyType.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/unresolvedAnnotationOnPropertyType.txt
index fb2c270956b..5522c5b4b6e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/unresolvedAnnotationOnPropertyType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/unresolvedAnnotationOnPropertyType.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnPropertyType.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: <ERROR TYPE REF: Symbol not found for Foo>
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <ERROR TYPE REF: Symbol not found for Foo>
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnPropertyType.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: <ERROR TYPE REF: Symbol not found for Foo>
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <ERROR TYPE REF: Symbol not found for Foo>
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnPropertyType.kt
     public final [ResolvedTo(CONTRACTS)] val prop: <ERROR TYPE REF: Symbol not found for Foo>
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetter.txt
index a455807e2e2..eb333093913 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetter.txt
@@ -54,13 +54,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt
     public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
         public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
-        public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetter.txt
index 83cdd75f3e5..c742c0162cd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetter.txt
@@ -62,14 +62,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt
         public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
         public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetterScript.txt
index a4572beb459..5095fb456bc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterAndSetterScript.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
             public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyWithGetterAndSetterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterScript.txt
index 70977c087bc..7a181416a05 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithGetterScript.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
             public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyWithGetterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int
-            public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotations.txt
index 3f1c41e79ac..c1221b99158 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotations.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
         @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
         @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=myPack/Anno.number] number: Int): R|myPack/Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-    }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](propertyProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: <implicit>
-        @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-        @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
@@ -270,25 +241,25 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
 
     }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](propertyProperty#) public final [ResolvedTo(CONTRACTS)] var <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: <implicit>
-        @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: <implicit>
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
             ^ String(str)
         }
-        @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| {
             ^ Unit#
         }
 
@@ -303,25 +274,25 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
 
     }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](propertyProperty#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: R|kotlin/String|
-        @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: R|kotlin/String|
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
             ^ String(str)
         }
-        @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](setterParameterProperty#) value: R|kotlin/String|): R|kotlin/Unit| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: R|kotlin/String|): R|kotlin/Unit| {
             ^ Unit#
         }
 
@@ -336,19 +307,19 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
             public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
-    @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  T|.variableToResolve: R|kotlin/String|
         @R|myPack/Anno|[Types](number = R|myPack/getterProperty|) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/String| {
@@ -369,19 +340,19 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotations.kt
             public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
-    @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) public final [ResolvedTo(BODY_RESOLVE)] var <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  T|.variableToResolve: R|kotlin/String|
         @R|myPack/Anno|[Types](number = R|myPack/getterProperty|) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotationsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotationsScript.txt
index ce9bfed4bf9..47b43690fc6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndAnnotationsScript.txt
@@ -334,48 +334,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
             @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyWithImplicitTypeAndAnnotationsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=myPack/Anno.number] number: Int): R|myPack/Anno| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-        }
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](propertyProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: <implicit>
-            @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-            @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -392,32 +350,32 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](propertyProperty#) public final [ResolvedTo(CONTRACTS)] var <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: <implicit>
-            @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: <implicit>
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
                 ^ String(str)
             }
-            @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| {
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -438,32 +396,32 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](propertyProperty#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: R|kotlin/String|
-            @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(receiverTypeProperty#)  T|.variableToResolve: R|kotlin/String|
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
                 ^ String(str)
             }
-            @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](setterParameterProperty#) value: R|kotlin/String|): R|kotlin/Unit| {
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: R|kotlin/String|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -484,25 +442,25 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  T|.variableToResolve: R|kotlin/String|
@@ -530,25 +488,25 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndAnnotationsScript.kts
 
         }
 
-        @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](receiverTypeProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val receiverTypeProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](typeParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val typeParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) public final [ResolvedTo(BODY_RESOLVE)] var <@R|myPack/Anno|[Types](number = R|myPack/typeParameterProperty|) [ResolvedTo(BODY_RESOLVE)] T> @RECEIVER:R|myPack/Anno|[Types](number = R|myPack/receiverProperty|) R|@R|myPack/Anno|(number = R|myPack/receiverTypeProperty|)  T|.variableToResolve: R|kotlin/String|
@@ -604,4 +562,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] propertyWithImplicitTypeAndAnnotationsScript.kt
             @R|myPack/Anno|[Types](number = R|myPack/setterProperty|) public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] @R|myPack/Anno|[Types](number = R|myPack/setterParameterProperty|) value: R|kotlin/String|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotations.txt
index 09523e2b3e6..ea8da5aae72 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotations.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
         @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
         @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=myPack/Anno.number] number: Int): R|myPack/Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-    }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val fieldProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](propertyProperty#) field:@FIELD:R|myPack/Anno|[Types](fieldProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var variableToResolve: <implicit> = LAZY_EXPRESSION
-        @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-        @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
@@ -234,21 +209,21 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
 
     }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val fieldProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](propertyProperty#) field:@FIELD:R|myPack/Anno|[Types](fieldProperty#) public final [ResolvedTo(CONTRACTS)] var variableToResolve: <implicit> = <strcat>(IntegerLiteral(42))
-        @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val fieldProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var variableToResolve: <implicit> = <strcat>(IntegerLiteral(42))
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
             ^ field#.plus#(String(str))
         }
-        @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| {
             ^ Unit#
         }
 
@@ -263,21 +238,21 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
 
     }
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val fieldProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    @R|myPack/Anno|[Types](propertyProperty#) field:@FIELD:R|myPack/Anno|[Types](fieldProperty#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
-        @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val fieldProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
             ^ field#.plus#(String(str))
         }
-        @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](setterParameterProperty#) value: R|kotlin/String|): R|kotlin/Unit| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: R|kotlin/String|): R|kotlin/Unit| {
             ^ Unit#
         }
 
@@ -292,15 +267,15 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
             public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
-    @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](fieldProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) field:@FIELD:R|myPack/Anno|[Types](number = R|myPack/fieldProperty|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
         @R|myPack/Anno|[Types](number = R|myPack/getterProperty|) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/String| {
@@ -321,15 +296,15 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotations.kt
             public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
-    @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
-    @R|myPack/Anno|[Types](fieldProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
+    @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) field:@FIELD:R|myPack/Anno|[Types](number = R|myPack/fieldProperty|) public final [ResolvedTo(BODY_RESOLVE)] [IsReferredViaField=true] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
         @R|myPack/Anno|[Types](number = R|myPack/getterProperty|) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotationsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotationsScript.txt
index be87f1402a9..8162cadf7d0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithImplicitTypeAndFieldAnnotationsScript.txt
@@ -286,42 +286,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kt
             @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyWithImplicitTypeAndFieldAnnotationsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=myPack/Anno.number] number: Int): R|myPack/Anno| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val number: Int = R|<local>/number|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
-
-        }
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val fieldProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
-
-        @R|myPack/Anno|[Types](propertyProperty#) field:@FIELD:R|myPack/Anno|[Types](fieldProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var variableToResolve: <implicit> = LAZY_EXPRESSION
-            @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-            @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -338,26 +302,26 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kt
 
         }
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val fieldProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val fieldProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](propertyProperty#) field:@FIELD:R|myPack/Anno|[Types](fieldProperty#) public final [ResolvedTo(CONTRACTS)] var variableToResolve: <implicit> = <strcat>(IntegerLiteral(42))
-            @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var variableToResolve: <implicit> = <strcat>(IntegerLiteral(42))
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
                 ^ field#.plus#(String(str))
             }
-            @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](setterParameterProperty#) value: <implicit>): R|kotlin/Unit| {
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: <implicit>): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -378,26 +342,26 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kt
 
         }
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val propertyProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val propertyProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val setterParameterProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val fieldProperty: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit>
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val fieldProperty: <implicit> = LAZY_EXPRESSION
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @R|myPack/Anno|[Types](propertyProperty#) field:@FIELD:R|myPack/Anno|[Types](fieldProperty#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
-            @R|myPack/Anno|[Types](getterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|myPack/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
                 ^ field#.plus#(String(str))
             }
-            @R|myPack/Anno|[Types](setterProperty#) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](setterParameterProperty#) value: R|kotlin/String|): R|kotlin/Unit| {
+            @R|myPack/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: R|kotlin/String|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -418,19 +382,19 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kt
 
         }
 
-        @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](fieldProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) field:@FIELD:R|myPack/Anno|[Types](number = R|myPack/fieldProperty|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
@@ -458,19 +422,19 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithImplicitTypeAndFieldAnnotationsScript.kt
 
         }
 
-        @R|myPack/Anno|[Types](propertyProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](getterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val getterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](setterParameterProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val setterParameterProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        @R|myPack/Anno|[Types](fieldProperty#) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
+        @R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val fieldProperty: R|kotlin/Int| = Int(42)
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         @R|myPack/Anno|[Types](number = R|myPack/propertyProperty|) field:@FIELD:R|myPack/Anno|[Types](number = R|myPack/fieldProperty|) public final [ResolvedTo(BODY_RESOLVE)] [IsReferredViaField=true] var variableToResolve: R|kotlin/String| = <strcat>(Int(42))
@@ -520,4 +484,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] propertyWithImplicitTypeAndFieldAnnotationsScri
             @R|myPack/Anno|[Types](number = R|myPack/setterProperty|) public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] @R|myPack/Anno|[Types](number = R|myPack/setterParameterProperty|) value: R|kotlin/String|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializer.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializer.txt
index 9ecfd8f12f5..16190426683 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializer.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializer.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt
     public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): Int
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): Int
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializerScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializerScript.txt
index 1bdc7dae6bd..45b844af519 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializerScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/propertyWithInitializerScript.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
             public? [ResolvedTo(RAW_FIR)] get(): Int
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-propertyWithInitializerScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): Int
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt b/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt
index 64b67980ca6..b94be043697 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt
@@ -118,21 +118,6 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
-    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt
index 34bb2e7232c..440ecd43143 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-redeclarationScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor(): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -290,4 +269,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] redeclarationScript.kts
             }
 
         }
-
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/resolveSuperTypeFromLocalClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/resolveSuperTypeFromLocalClass.txt
index c9326549736..f160ab3a660 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/resolveSuperTypeFromLocalClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/resolveSuperTypeFromLocalClass.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt
-    public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt
     public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : 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 4873b2f693a..7099f2a804c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
@@ -174,28 +174,6 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-resolveSuperTypeFromLocalClassScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface2 : R|kotlin/Any| {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : UsedInterface2 {
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructor.txt
index 8d3eaea95fd..eaa24958a5f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructor.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt
-    public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-            LAZY_super<<implicit>>
-        }
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt
     public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
index a947ef2efe1..194fa81583c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-resolveTypeFromLocalClassConstructorScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunction.txt b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunction.txt
index d8b2cf607b6..2cab33b9741 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunction.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunction.txt
@@ -142,24 +142,6 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt
-    public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
-    }
-    public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-            LAZY_super<<implicit>>
-        }
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt
     public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunctionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunctionScript.txt
index d5dd2607b12..f3d886730ad 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunctionScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/resolveTypeFromLocalFunctionScript.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-resolveTypeFromLocalFunctionScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface UsedInterface : R|kotlin/Any| {
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] class UsedClass : UsedInterface {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UsedClass] constructor(): R|one/two/UsedClass| {
-                LAZY_super<<implicit>>
-            }
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/script.txt b/analysis/low-level-api-fir/testData/lazyResolve/script.txt
index 927e7071b5b..8081ab045be 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/script.txt
@@ -438,61 +438,6 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
         @Anno[Unresolved](LAZY_EXPRESSION) builder#.execute#()
         builder#.version# = String()
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-script.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
-
-            @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
-                LAZY_super<R|kotlin/Enum<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(RAW_FIR)] [ContainingClassKey=En] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|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>|
-
-        }
-
-        @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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
-
-        }
-
-        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> { LAZY_BLOCK }
-
-        @Anno[Unresolved](En#.Entry#) build#(<L> = LAZY_EXPRESSION)
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        @Anno[Unresolved](En#.Entry#) builder#.execute#()
-        builder#.version# = String()
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -529,7 +474,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+        @Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) 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| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -539,13 +484,13 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> { LAZY_BLOCK }
 
-        @Anno[Unresolved](En#.Entry#) build#(<L> = LAZY_EXPRESSION)
+        @Anno[Unresolved](LAZY_EXPRESSION) build#(<L> = LAZY_EXPRESSION)
         public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @Anno[Unresolved](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](LAZY_EXPRESSION) builder#.execute#()
         builder#.version# = String()
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -584,7 +529,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
+        @Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) 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| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -594,13 +539,13 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> { LAZY_BLOCK }
 
-        @Anno[Unresolved](En#.Entry#) build#(<L> = LAZY_EXPRESSION)
+        @Anno[Unresolved](LAZY_EXPRESSION) build#(<L> = LAZY_EXPRESSION)
         public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        @Anno[Unresolved](En#.Entry#) builder#.execute#()
+        @Anno[Unresolved](LAZY_EXPRESSION) builder#.execute#()
         builder#.version# = String()
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
@@ -673,7 +618,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
                 public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
                 public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            @R|Anno|[Types](Q|En|.R|/En.Entry|) public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
+            @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
@@ -706,7 +651,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
 
         }
 
-        @R|Anno|[Types](Q|En|.R|/En.Entry|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+        @R|Anno|[Types](En#.Entry#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
             ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/script2.txt b/analysis/low-level-api-fir/testData/lazyResolve/script2.txt
index 7fc010af5f9..d304d3d8da1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/script2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/script2.txt
@@ -318,46 +318,6 @@ 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)] <script-script2.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): Int?
-
-        public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        public? final? [ResolvedTo(RAW_FIR)] val z: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> { LAZY_BLOCK }
-
-        consume#(LAZY_EXPRESSION)
-        x#!!
-        consume#(LAZY_EXPRESSION)
-        public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] val cz: <implicit> = LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] get(): <implicit>
-
-            public? final? [ResolvedTo(RAW_FIR)] fun bar(): <implicit> { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/script3.txt b/analysis/low-level-api-fir/testData/lazyResolve/script3.txt
index 1d0cc4b1d7b..12f221009fc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/script3.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/script3.txt
@@ -270,40 +270,6 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
         build#(<L> = LAZY_EXPRESSION)
         variable# = String(1)
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] script3.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-script3.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
-
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = LAZY_EXPRESSION
-            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 variable: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
-
-        build#(<L> = LAZY_EXPRESSION)
-        variable# = String(1)
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] script3.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/script4.txt b/analysis/low-level-api-fir/testData/lazyResolve/script4.txt
index 87240dd055a..f1c1b4bcc27 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/script4.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/script4.txt
@@ -206,32 +206,6 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit>
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] script4.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-script4.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = LAZY_EXPRESSION
-                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(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val $$result: <implicit> = @Suppress[Unresolved](String(abc)) @Deprecated[Unresolved](String(it is deprecated)) builder#.execute#()
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit>
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] script4.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -254,7 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
         public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public final [ResolvedTo(CONTRACTS)] val $$result: <implicit> = @Suppress[Unresolved](String(abc)) @Deprecated[Unresolved](String(it is deprecated)) builder#.execute#()
+        public final [ResolvedTo(CONTRACTS)] val $$result: <implicit> = @Suppress[Unresolved](LAZY_EXPRESSION) @Deprecated[Unresolved](LAZY_EXPRESSION) builder#.execute#()
             public [ResolvedTo(CONTRACTS)] get(): <implicit>
 
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/scriptArgument.txt b/analysis/low-level-api-fir/testData/lazyResolve/scriptArgument.txt
index cde1a48b233..e48028db3d3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/scriptArgument.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/scriptArgument.txt
@@ -54,13 +54,6 @@ FILE: [ResolvedTo(RAW_FIR)] scriptArgument.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(RAW_FIR)] scriptArgument.kts
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-scriptArgument.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-
 CONTRACTS:
 FILE: [ResolvedTo(RAW_FIR)] scriptArgument.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructor.txt
index 5a7b498f0bb..eff2fb0fefa 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructor.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt
index ac80a9dd673..1abb78dc675 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt
@@ -150,25 +150,6 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt
     }
     public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt
-    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
-            LAZY_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 [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] str: R|kotlin/String|): R|A| {
-            LAZY_this<R|A|>
-        }
-
-        public final [ResolvedTo(STATUS)] fun foo(): <implicit> { LAZY_BLOCK }
-
-    }
-    public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt
     public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt
index b1c9c4f07ed..d4071262553 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt
@@ -198,31 +198,6 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
         public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-secondaryConstructorParameterScript.kts>
-        [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| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| {
-                LAZY_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 [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] str: R|kotlin/String|): R|A| {
-                LAZY_this<R|A|>
-            }
-
-            public final [ResolvedTo(STATUS)] fun foo(): <implicit> { LAZY_BLOCK }
-
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun String.myToInt(): Int { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorScript.txt
index 42c621847f6..03f6bfca718 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-secondaryConstructorScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] x: Int): R|A| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/statement.txt b/analysis/low-level-api-fir/testData/lazyResolve/statement.txt
index d601e05df6e..bec0d130fc6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/statement.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/statement.txt
@@ -390,55 +390,6 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts
         R|/builder|.R|/Builder.execute|()
         R|/builder|.R|/Builder.version| = String()
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] statement.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] <script-statement.kts>
-        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
-
-            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
-                println#(version#)
-            }
-
-        }
-
-        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
-        }
-
-        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [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(BODY_RESOLVE)] class A : R|kotlin/Any| {
-                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|<local>/A| {
-                    super<R|kotlin/Any|>()
-                }
-
-                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
-                }
-
-            }
-
-            this@R|special/anonymous|.R|/Builder.execute|()
-        }
-        )
-        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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 [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|Builder|
-
-        R|/builder|.R|/Builder.execute|()
-        R|/builder|.R|/Builder.version| = String()
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/statement2.txt b/analysis/low-level-api-fir/testData/lazyResolve/statement2.txt
index fcc2695dd54..65e0c57ea99 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/statement2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/statement2.txt
@@ -278,41 +278,6 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit|
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] statement2.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] <script-statement2.kts>
-        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
-
-            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
-                println#(version#)
-            }
-
-        }
-
-        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
-            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
-        }
-
-        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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 [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|Builder|
-
-        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|()
-            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit|
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/statementTransformation.txt b/analysis/low-level-api-fir/testData/lazyResolve/statementTransformation.txt
index 1fc7372ddcf..091401208b7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/statementTransformation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/statementTransformation.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] statementTransformation.kts
         public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] statementTransformation.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-statementTransformation.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] val myProp: ( () -> Unit ) = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): ( () -> Unit )
-
-        myProp#(<L> = LAZY_EXPRESSION)
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statementTransformation.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverride.txt
index 7ac38637862..46ee5ff2d02 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverride.txt
@@ -149,27 +149,6 @@ EXPECT_ACTUAL_MATCHING:
 TARGET: public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: R|kotlin/Int|
 
 
-FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverride.kt
-    public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
-            LAZY_super<R|AbstractClass<kotlin/Int>|>
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|AbstractClass<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public abstract [ResolvedTo(STATUS)] val property: R|T|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] get(): R|T|
-
-    }
-
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: R|kotlin/Int|
-
-
 FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverride.kt
     public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideInDifferentModules.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideInDifferentModules.txt
index 9142ecd9a5a..4329e2ad727 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideInDifferentModules.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideInDifferentModules.txt
@@ -86,18 +86,6 @@ EXPECT_ACTUAL_MATCHING:
 TARGET: public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: R|kotlin/Int|
 
 
-FILE: [ResolvedTo(IMPORTS)] SubClass.kt
-    public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
-            LAZY_super<R|AbstractClass<kotlin/Int>|>
-        }
-
-    }
-
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: R|kotlin/Int|
-
-
 FILE: [ResolvedTo(IMPORTS)] SubClass.kt
     public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideScript.txt
index 8885feca729..b22c13baa90 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideScript.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: R|kotlin/Int|
-
-
-FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-substitutionFakeOverrideScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
-                LAZY_super<R|AbstractClass<kotlin/Int>|>
-            }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|AbstractClass<T>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public abstract [ResolvedTo(STATUS)] val property: R|T|
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] get(): R|T|
-
-        }
-
-
 CONTRACTS:
 TARGET: public abstract [ResolvedTo(CONTRACTS)] [SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: R|kotlin/Int|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitType.txt
index 6f39ebc021e..774524b8958 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitType.txt
@@ -163,29 +163,6 @@ EXPECT_ACTUAL_MATCHING:
 TARGET: public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> kotlin/Int}, baseSymbol=FirPropertySymbol /AbstractClass.property), SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: <implicit>
 
 
-FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideWithImplicitType.kt
-    public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
-            LAZY_super<R|AbstractClass<kotlin/Int>|>
-        }
-
-    }
-    public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|AbstractClass<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(STATUS)] val property: <implicit> = LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] get(): <implicit>
-
-        public abstract [ResolvedTo(STATUS)] fun foo(): R|T|
-
-    }
-
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> kotlin/Int}, baseSymbol=FirPropertySymbol /AbstractClass.property), SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: <implicit>
-
-
 FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideWithImplicitType.kt
     public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt
index 6c84c1c83c5..c4c8e1a1e61 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt
@@ -230,35 +230,6 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideWithImplicitTypeScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> kotlin/Int}, baseSymbol=FirPropertySymbol /AbstractClass.property), SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: <implicit>
-
-
-FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-substitutionFakeOverrideWithImplicitTypeScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public abstract [ResolvedTo(STATUS)] class SubClass : R|AbstractClass<kotlin/Int>| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
-                LAZY_super<R|AbstractClass<kotlin/Int>|>
-            }
-
-        }
-
-        public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|AbstractClass<T>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(STATUS)] val property: <implicit> = LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] get(): <implicit>
-
-            public abstract [ResolvedTo(STATUS)] fun foo(): R|T|
-
-        }
-
-
 CONTRACTS:
 TARGET: public final [ResolvedTo(CONTRACTS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> kotlin/Int}, baseSymbol=FirPropertySymbol /AbstractClass.property), SubstitutedOverrideOriginalKey=/AbstractClass.property] val property: <implicit>
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/superTypes.txt b/analysis/low-level-api-fir/testData/lazyResolve/superTypes.txt
index d33a6f042db..e351a6e477d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/superTypes.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/superTypes.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] superTypes.kt
-    public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public? open [ResolvedTo(RAW_FIR)] class B : A {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
-            LAZY_super<A>
-        }
-
-    }
-    public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class resolveMe : R|A| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-            LAZY_super<A>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] superTypes.kt
     public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoop.txt b/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoop.txt
index ad3b8263216..b8aaa50813c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoop.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoop.txt
@@ -214,33 +214,6 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt
-    public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class resolveMe : R|C| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-            LAZY_super<C>
-        }
-
-    }
-    public? open [ResolvedTo(SUPER_TYPES)] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-            LAZY_super<B>
-        }
-
-    }
-    public? open [ResolvedTo(SUPER_TYPES)] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
-            LAZY_super<C>
-        }
-
-    }
-    public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
-            LAZY_super<A>
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt
     public open [ResolvedTo(CONTRACTS)] class resolveMe : R|C| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoopScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoopScript.txt
index 8ba4430492f..30aafd3f94e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoopScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/superTypesLoopScript.txt
@@ -278,41 +278,6 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoopScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] superTypesLoopScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-superTypesLoopScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class resolveMe : R|C| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                LAZY_super<C>
-            }
-
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-                LAZY_super<B>
-            }
-
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
-                LAZY_super<C>
-            }
-
-        }
-
-        public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
-                LAZY_super<A>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] superTypesLoopScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/superTypesScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/superTypesScript.txt
index e9ff5b25de3..93547b2f966 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/superTypesScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/superTypesScript.txt
@@ -222,34 +222,6 @@ FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-superTypesScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public? open [ResolvedTo(RAW_FIR)] class B : A {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
-                LAZY_super<A>
-            }
-
-        }
-
-        public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class resolveMe : R|A| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-                LAZY_super<A>
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt
index 8b0cefb675e..a7437dbde23 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] val something: R|kotlin/String|
-    public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] val something: R|kotlin/String|
     public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt
index 687b659ffef..6fe06fe2708 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt
@@ -198,34 +198,9 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] val something: R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String|
-    @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] val something: R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String|
-    @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
         ^getSomething String(str).also#(::println#)
     }
 
@@ -235,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
             ^getSomething String(str).also#(::println#)
         }
 
@@ -249,12 +224,12 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 TARGET: public open override [<synthetic> IMPLICIT_TYPES_BODY_RESOLVE] val something: R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String|
-    @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
         ^getSomething String(str).also#(::println#)
     }
 
@@ -264,7 +239,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|@R|Anno|(<strcat>(String(type: ), prop#))  kotlin/String| {
             ^getSomething String(str).also#(::println#)
         }
 
@@ -278,8 +253,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 TARGET: public open override [<synthetic> ANNOTATIONS_ARGUMENTS_MAPPING] val something: R|@R|Anno|(s = <strcat>(String(type: ), R|/prop|))  kotlin/String|
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt
index 40a9bac7387..9a49707f552 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt
@@ -110,20 +110,6 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] val something: <implicit>
-    public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): <implicit> { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] val something: <implicit>
     public [<synthetic> ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt
index daa849cac16..10fbe2dd938 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt
@@ -214,36 +214,9 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] val something: <implicit>
-    @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): <implicit> { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] val something: <implicit>
-    @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
 
 FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public final [ResolvedTo(STATUS)] class Derived : R|Base| {
@@ -251,7 +224,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): <implicit> { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): <implicit> { LAZY_BLOCK }
 
     }
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
@@ -263,14 +236,14 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 TARGET: public open override [<synthetic> IMPLICIT_TYPES_BODY_RESOLVE] val something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
         ^getSomething <strcat>(String(body: ), R|/propertyFromBody|)
     }
 
@@ -280,7 +253,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
             ^getSomething <strcat>(String(body: ), R|/propertyFromBody|)
         }
 
@@ -294,8 +267,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyFromBody: R|kotlin/String| = String(str).R|kotlin/String.plus|(Int(1).R|kotlin/Int.toString|())
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotationsAsGetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotationsAsGetter.txt
index 716712f4604..f189b97bdf3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotationsAsGetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotationsAsGetter.txt
@@ -206,34 +206,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): <implicit> { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
 CONTRACTS:
-TARGET: @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
+TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
 
 FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public final [ResolvedTo(STATUS)] class Derived : R|Base| {
@@ -241,7 +215,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): <implicit> { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): <implicit> { LAZY_BLOCK }
 
     }
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
@@ -253,13 +227,13 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
-TARGET: @R|Anno|[Types](<strcat>(String(number: ), prop#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
     ^getSomething <strcat>(String(body: ), R|/propertyFromBody|)
 }
 
@@ -269,7 +243,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(number: ), prop#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
             ^getSomething <strcat>(String(body: ), R|/propertyFromBody|)
         }
 
@@ -283,8 +257,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val prop: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val propertyFromBody: R|kotlin/String| = String(str).R|kotlin/String.plus|(Int(1).R|kotlin/Int.toString|())
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt
index aea778526d8..5e8dc33fba7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt
@@ -350,56 +350,12 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] var something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(second generation getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-    @R|Anno|[Types](<strcat>(String(second generation setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|KotlinBase| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|KotlinBase|>
-        }
-
-        @R|Anno|[Types](<strcat>(String(second generation getSomething: ), getterProperty#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-        @R|Anno|[Types](<strcat>(String(second generation setSomething: ), setterProperty#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun setSomething([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
-
-    }
-    public open [ResolvedTo(STATUS)] class KotlinBase : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinBase] constructor(): R|KotlinBase| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(STATUS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(STATUS)] fun setSomething([ResolvedTo(STATUS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] var something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(second generation getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
         <strcat>(String(body: ), propertyFromBody#)
     }
-    @R|Anno|[Types](<strcat>(String(second generation setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
 
 FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public final [ResolvedTo(STATUS)] class Derived : R|KotlinBase| {
@@ -407,11 +363,11 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|KotlinBase|>
         }
 
-        @R|Anno|[Types](<strcat>(String(second generation getSomething: ), getterProperty#)) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|kotlin/String| {
             <strcat>(String(body: ), propertyFromBody#)
         }
 
-        @R|Anno|[Types](<strcat>(String(second generation setSomething: ), setterProperty#)) public open override [ResolvedTo(CONTRACTS)] fun setSomething([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun setSomething([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
 
     }
     public open [ResolvedTo(STATUS)] class KotlinBase : R|Base| {
@@ -433,21 +389,21 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 TARGET: public open override [<synthetic> IMPLICIT_TYPES_BODY_RESOLVE] var something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(second generation getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
         <strcat>(String(body: ), propertyFromBody#)
     }
-    @R|Anno|[Types](<strcat>(String(second generation setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
         ^setSomething R|kotlin/io/println|(<strcat>(String(str ), R|<local>/s|))
     }
 
@@ -457,11 +413,11 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|KotlinBase|>
         }
 
-        @R|Anno|[Types](<strcat>(String(second generation getSomething: ), getterProperty#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
             <strcat>(String(body: ), propertyFromBody#)
         }
 
-        @R|Anno|[Types](<strcat>(String(second generation setSomething: ), setterProperty#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun setSomething([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun setSomething([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
             ^setSomething R|kotlin/io/println|(<strcat>(String(str ), R|<local>/s|))
         }
 
@@ -485,14 +441,14 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 TARGET: public open override [<synthetic> ANNOTATIONS_ARGUMENTS_MAPPING] var something: R|kotlin/String|
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt
index f1e79bcd93e..04411aa0243 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt
@@ -134,23 +134,6 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] var something: R|kotlin/String|
-    public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-    public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-        public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun setSomething([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] var something: R|kotlin/String|
     public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt
index b0ee5f490be..84ad781e636 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt
@@ -270,46 +270,12 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: public open override [<synthetic> ARGUMENTS_OF_ANNOTATIONS] var something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-    @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-        @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun setSomething([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-
 CONTRACTS:
 TARGET: public open override [<synthetic> CONTRACTS] var something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
         <strcat>(String(body: ), propertyFromBody#)
     }
-    @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
         println#(s#)
     }
 
@@ -319,11 +285,11 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|kotlin/String| {
             <strcat>(String(body: ), propertyFromBody#)
         }
 
-        @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public open override [ResolvedTo(CONTRACTS)] fun setSomething([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun setSomething([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
             println#(s#)
         }
 
@@ -337,21 +303,21 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 TARGET: public open override [<synthetic> IMPLICIT_TYPES_BODY_RESOLVE] var something: R|kotlin/String|
-    @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
         <strcat>(String(body: ), propertyFromBody#)
     }
-    @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+    @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
         println#(s#)
     }
 
@@ -361,11 +327,11 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
             <strcat>(String(body: ), propertyFromBody#)
         }
 
-        @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun setSomething([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun setSomething([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
             println#(s#)
         }
 
@@ -379,14 +345,14 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 TARGET: public open override [<synthetic> ANNOTATIONS_ARGUMENTS_MAPPING] var something: R|kotlin/String|
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsGetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsGetter.txt
index f2b93081f41..4ced2840064 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsGetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsGetter.txt
@@ -254,40 +254,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/String| { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(STATUS)] fun setSomething([ResolvedTo(STATUS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-
 CONTRACTS:
-TARGET: @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
+TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] get(): R|kotlin/String| {
     <strcat>(String(body: ), propertyFromBody#)
 }
 
@@ -297,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun getSomething(): R|kotlin/String| {
             <strcat>(String(body: ), propertyFromBody#)
         }
 
@@ -313,8 +281,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
@@ -323,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
-TARGET: @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
+TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| {
     <strcat>(String(body: ), propertyFromBody#)
 }
 
@@ -333,7 +301,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             LAZY_super<R|Base|>
         }
 
-        @R|Anno|[Types](<strcat>(String(getSomething: ), getterProperty#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun getSomething(): R|kotlin/String| {
             <strcat>(String(body: ), propertyFromBody#)
         }
 
@@ -349,8 +317,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
 
     }
-    public final [ResolvedTo(STATUS)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsSetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsSetter.txt
index 6ffb269fd0a..fb3dbc4a3be 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsSetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotationsAsSetter.txt
@@ -254,40 +254,8 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-TARGET: @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
-
-FILE: [ResolvedTo(IMPORTS)] Derived.kt
-    public final [ResolvedTo(STATUS)] class Derived : R|Base| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=Derived] constructor(): R|Derived| {
-            LAZY_super<R|Base|>
-        }
-
-        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(STATUS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
-
-        @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public open override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun setSomething([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
-
-    }
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        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)] val getterProperty: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-    public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
-
 CONTRACTS:
-TARGET: @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
+TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
 
 FILE: [ResolvedTo(IMPORTS)] Derived.kt
     public final [ResolvedTo(STATUS)] class Derived : R|Base| {
@@ -297,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
 
         @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(STATUS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
 
-        @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public open override [ResolvedTo(CONTRACTS)] fun setSomething([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(CONTRACTS)] fun setSomething([ResolvedTo(CONTRACTS)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): <implicit> { LAZY_BLOCK }
 
     }
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
@@ -311,15 +279,15 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     }
     public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 IMPLICIT_TYPES_BODY_RESOLVE:
-TARGET: @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public [<synthetic> ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
     ^setSomething R|kotlin/io/println|(R|<local>/s|)
 }
 
@@ -331,7 +299,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
 
         @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(STATUS)] fun getSomething(): R|kotlin/String| { LAZY_BLOCK }
 
-        @R|Anno|[Types](<strcat>(String(setSomething: ), setterProperty#)) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun setSomething([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
+        @R|Anno|[Types](LAZY_EXPRESSION) public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun setSomething([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] s: R|@R|Anno|(<strcat>(String(setter type ), propertyFromSetter#))  kotlin/String|): R|kotlin/Unit| {
             ^setSomething R|kotlin/io/println|(R|<local>/s|)
         }
 
@@ -347,12 +315,12 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt
     }
     public? final? [ResolvedTo(RAW_FIR)] val getterProperty: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val setterProperty: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val setterProperty: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(RAW_FIR)] val propertyFromBody: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public final [ResolvedTo(STATUS)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit>
+    public? final? [ResolvedTo(RAW_FIR)] val propertyFromSetter: <implicit> = LAZY_EXPRESSION
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 TARGET: @R|Anno|[Types](s = <strcat>(String(setSomething: ), R|/setterProperty|)) public [<synthetic> ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] s: R|@R|Anno|(s = <strcat>(String(setter type ), R|/propertyFromSetter|))  kotlin/String|): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclaration.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclaration.txt
index 13760409595..79d4ba4313c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclaration.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclaration.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] syntheticResultDeclaration.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit>
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] syntheticResultDeclaration.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-syntheticResultDeclaration.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): <implicit> { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val $$result: <implicit> = foo#()
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit>
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] syntheticResultDeclaration.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclarationWithBigBody.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclarationWithBigBody.txt
index bc400c71d57..347267b6421 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclarationWithBigBody.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticResultDeclarationWithBigBody.txt
@@ -94,18 +94,6 @@ FILE: [ResolvedTo(IMPORTS)] syntheticResultDeclarationWithBigBody.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit>
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] syntheticResultDeclarationWithBigBody.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] <script-syntheticResultDeclarationWithBigBody.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> foo([ResolvedTo(RAW_FIR)] action: ( () -> T )): T { LAZY_BLOCK }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val $$result: <implicit> = foo#(<L> = LAZY_EXPRESSION)
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit>
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] syntheticResultDeclarationWithBigBody.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctions.txt b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctions.txt
index f33d8591f70..8999a04c876 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctions.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctions.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt
     public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsScript.txt
index f57fdb998fb..9156107ba19 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsScript.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
         public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-topLevelFunctionsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt
index b83fdb15701..1ac6943ab6e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.k
     public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
index e27e378f2fd..188a05a47a6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeSc
         public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitType.txt
index f398abdedc8..732185a6500 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitType.txt
@@ -46,12 +46,6 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt
     public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): <implicit> { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): <implicit> { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt
index ad072bb3c22..41eda464d9b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt
@@ -102,19 +102,6 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitTypeScript.kts
         public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): <implicit> { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitTypeScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-topLevelFunctionsWithImplicitTypeScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): <implicit> { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt
index 4706216856f..e764848d72f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias ResolveMe<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> = R|kotlin/collections/Map<T, K>|
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias ResolveMe<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> = R|kotlin/collections/Map<T, K>|
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt
     public final [ResolvedTo(CONTRACTS)] typealias ResolveMe<[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> = R|kotlin/collections/Map<T, K>|
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 049ad189baa..788c385a068 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias ResolveMe<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> = R|kotlin/collections/Map<T, K>|
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeAliasWithTypeParametersScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias ResolveMe<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> = R|kotlin/collections/Map<T, K>|
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/unresolvedAnnotationOnTypeAlias.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/unresolvedAnnotationOnTypeAlias.txt
index 08d61cf3840..73b19ef4ce9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/unresolvedAnnotationOnTypeAlias.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/unresolvedAnnotationOnTypeAlias.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnTypeAlias.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val myAlias: <implicit> = LAZY_EXPRESSION
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit>
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnTypeAlias.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val myAlias: <implicit> = LAZY_EXPRESSION
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): <implicit>
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] unresolvedAnnotationOnTypeAlias.kt
     public final [ResolvedTo(CONTRACTS)] val myAlias: <implicit> = @Anno[Unresolved](Foo#) Foo#
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBounds.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBounds.txt
index 4165b561e2e..8948d843cd4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBounds.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBounds.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt
     }
     public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK }
-    public? final? [ResolvedTo(RAW_FIR)] interface 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 : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt
     public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] foo: R|Foo|): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBoundsScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBoundsScript.txt
index 3e793ccb35a..89aa43d3b96 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBoundsScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterBoundsScript.txt
@@ -134,23 +134,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
         public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] F : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterBoundsScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK }
-
-        public? final? [ResolvedTo(RAW_FIR)] interface 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 : Foo, [ResolvedTo(RAW_FIR)] B : Bar<F>> F.util(): B { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass.txt
index e20fe907834..068d2249403 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class MyClass<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type> : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type>(): R|MyClass<Type>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt
     public final [ResolvedTo(CONTRACTS)] class MyClass<[ResolvedTo(CONTRACTS)] Type> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2.txt
index dcf6a8e2a03..45ebcd068e9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
-    public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass<Type>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final inner [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Second<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2>(): R|MyClass.Second<Type2, Type>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
     public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2Script.txt
index 1cafc97ae8a..b355f3367cb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2Script.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClass2Script.txt
@@ -166,27 +166,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterOfClass2Script.kts>
-        [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>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final inner [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Second<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2>(): R|MyClass.Second<Type2, Type>| {
-                    LAZY_super<R|kotlin/Any|>
-                }
-
-            }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClassScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClassScript.txt
index fe21422f138..9ab477cb6b3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClassScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfClassScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterOfClassScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class MyClass<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type>(): R|MyClass<Type>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] t: Type): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunction.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunction.txt
index c6a7408b0a0..44b69ab9d06 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunction.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunction.txt
@@ -86,17 +86,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt
-    public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
-        public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt
     public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunctionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
index 6bb1754d26e..24d0380e194 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
         }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterOfNonLocalFunctionScript.kts>
-        [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| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK }
-
-        }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopFunction.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopFunction.txt
index 293d9673495..70f1508d789 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopFunction.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopFunction.txt
@@ -30,10 +30,6 @@ EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt
     public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] 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 b4769cb8f51..179d221dffa 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopFunctionScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopFunctionScript.txt
@@ -70,15 +70,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterOfTopFunctionScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetter.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetter.txt
index b015317a7b6..7d997bda694 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetter.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetter.txt
@@ -38,11 +38,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type> R|Type|.x: R|kotlin/Int|
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type> R|Type|.x: R|kotlin/Int|
-        public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt
     public final [ResolvedTo(CONTRACTS)] val <[ResolvedTo(CONTRACTS)] Type> R|Type|.x: R|kotlin/Int|
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetterScript.txt
index 4547a03daa7..93b834f7f5a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetterScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTopSetterScript.txt
@@ -78,16 +78,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterOfTopSetterScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type> R|Type|.x: R|kotlin/Int|
-            public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK }
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAlias.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAlias.txt
index b6c492f458a..5f272712fbb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAlias.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAlias.txt
@@ -78,16 +78,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt
     }
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias Alias<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] TypeParam> = R|X<TypeParam>|
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt
-    public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X<T>| {
-            LAZY_super<R|kotlin/Any|>
-        }
-
-    }
-    public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias Alias<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] TypeParam> = R|X<TypeParam>|
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt
     public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAliasScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAliasScript.txt
index 41b4e533516..dc03ba6f812 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/typeParameterOfTypeAliasScript.txt
@@ -126,22 +126,6 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias Alias<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] TypeParam> = R|X<TypeParam>|
 
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
-    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] <script-typeParameterOfTypeAliasScript.kts>
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-        public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X<T>| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-        }
-
-        public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias Alias<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] TypeParam> = R|X<TypeParam>|
-
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveStdlibSources/wrappedInt.txt b/analysis/low-level-api-fir/testData/lazyResolveStdlibSources/wrappedInt.txt
index b8cb8c6f39e..3222ef93364 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveStdlibSources/wrappedInt.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveStdlibSources/wrappedInt.txt
@@ -478,66 +478,6 @@ FILE: [ResolvedTo(IMPORTS)] TypeReference.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: [ResolvedTo(IMPORTS)] TypeReference.kt
-    @R|kotlin/SinceKotlin|[Types](String(1.4)) public final [ResolvedTo(STATUS)] class TypeReference : R|kotlin/reflect/KType| {
-        @R|kotlin/SinceKotlin|[Types](String(1.6)) public [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=kotlin/jvm/internal/TypeReference.classifier] classifier: R|kotlin/reflect/KClassifier|, [ResolvedTo(STATUS)] [CorrespondingProperty=kotlin/jvm/internal/TypeReference.arguments] arguments: R|kotlin/collections/List<kotlin/reflect/KTypeProjection>|, [ResolvedTo(STATUS)] [CorrespondingProperty=kotlin/jvm/internal/TypeReference.platformTypeUpperBound] platformTypeUpperBound: R|kotlin/reflect/KType?|, [ResolvedTo(STATUS)] [CorrespondingProperty=kotlin/jvm/internal/TypeReference.flags] flags: R|kotlin/Int|): R|kotlin/jvm/internal/TypeReference| {
-            LAZY_super<<implicit>>
-        }
-
-        public open override [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val classifier: R|kotlin/reflect/KClassifier| = R|<local>/classifier|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): R|kotlin/reflect/KClassifier|
-
-        public open override [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val arguments: R|kotlin/collections/List<kotlin/reflect/KTypeProjection>| = R|<local>/arguments|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): R|kotlin/collections/List<kotlin/reflect/KTypeProjection>|
-
-        @R|kotlin/SinceKotlin|[Types](String(1.6)) internal final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val platformTypeUpperBound: R|kotlin/reflect/KType?| = R|<local>/platformTypeUpperBound|
-            internal [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): R|kotlin/reflect/KType?|
-
-        @R|kotlin/SinceKotlin|[Types](String(1.6)) internal final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val flags: R|kotlin/Int| = R|<local>/flags|
-            internal [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): R|kotlin/Int|
-
-        public [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] constructor([ResolvedTo(STATUS)] classifier: R|kotlin/reflect/KClassifier|, [ResolvedTo(STATUS)] arguments: R|kotlin/collections/List<kotlin/reflect/KTypeProjection>|, [ResolvedTo(STATUS)] isMarkedNullable: R|kotlin/Boolean|): R|kotlin/jvm/internal/TypeReference| {
-            LAZY_this<R|kotlin/jvm/internal/TypeReference|>
-        }
-
-        public open override [ResolvedTo(STATUS)] val annotations: R|kotlin/collections/List<kotlin/Annotation>|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): R|kotlin/collections/List<kotlin/Annotation>| { LAZY_BLOCK }
-
-        public open override [ResolvedTo(STATUS)] val isMarkedNullable: R|kotlin/Boolean|
-            public [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): R|kotlin/Boolean| { LAZY_BLOCK }
-
-        public open override operator [ResolvedTo(STATUS)] fun equals([ResolvedTo(STATUS)] other: R|kotlin/Any?|): R|kotlin/Boolean| { LAZY_BLOCK }
-
-        public open override [ResolvedTo(STATUS)] fun hashCode(): R|kotlin/Int| { LAZY_BLOCK }
-
-        public open override [ResolvedTo(STATUS)] fun toString(): R|kotlin/String| { LAZY_BLOCK }
-
-        private final [ResolvedTo(STATUS)] fun asString([ResolvedTo(STATUS)] convertPrimitiveToWrapper: R|kotlin/Boolean|): R|kotlin/String| { LAZY_BLOCK }
-
-        private final [ResolvedTo(STATUS)] val R|java/lang/Class<*>|.arrayClassName: <implicit>
-            private [ResolvedTo(STATUS)] [ContainingClassKey=TypeReference] get(): <implicit> { LAZY_BLOCK }
-
-        private final [ResolvedTo(STATUS)] fun R|kotlin/reflect/KTypeProjection|.asString(): R|kotlin/String| { LAZY_BLOCK }
-
-        internal final companion [ResolvedTo(STATUS)] object Companion : R|kotlin/Any| {
-            private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|kotlin/jvm/internal/TypeReference.Companion| {
-                LAZY_super<R|kotlin/Any|>
-            }
-
-            internal final const [ResolvedTo(STATUS)] val IS_MARKED_NULLABLE: <implicit> = LAZY_EXPRESSION
-                internal [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
-
-            internal final const [ResolvedTo(STATUS)] val IS_MUTABLE_COLLECTION_TYPE: <implicit> = LAZY_EXPRESSION
-                internal [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): <implicit>
-
-            internal final const [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val IS_NOTHING_TYPE: <implicit> = LAZY_EXPRESSION
-                internal [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Companion] get(): <implicit>
-
-        }
-
-    }
-
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] TypeReference.kt
     @R|kotlin/SinceKotlin|[Types](String(1.4)) public final [ResolvedTo(STATUS)] class TypeReference : R|kotlin/reflect/KType| {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
index 417045c6935..76e18dcec0b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
@@ -247,16 +247,6 @@ class FirCallResolver(
 
         @Suppress("NAME_SHADOWING")
         val qualifiedAccess = qualifiedAccess.let(transformer::transformExplicitReceiver)
-
-        // In red code, annotations can call arbitrary non-const declarations.
-        // During annotation arguments phase, we exit out if the receiver has unresolved type so that we don't throw exceptions.
-        // During body resolve, we will report something like ANNOTATION_ARGUMENT_MUST_BE_CONST.
-        if (transformer.baseTransformerPhase == FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS &&
-            qualifiedAccess.explicitReceiver?.isResolved == false
-        ) {
-            return qualifiedAccess
-        }
-
         val nonFatalDiagnosticFromExpression = (qualifiedAccess as? FirPropertyAccessExpression)?.nonFatalDiagnostics
 
         val basicResult by lazy(LazyThreadSafetyMode.NONE) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt
index 5d18273a90c..7434721c9a1 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt
@@ -82,7 +82,6 @@ fun FirResolvePhase.createCompilerProcessorByPhase(
         SEALED_CLASS_INHERITORS -> FirSealedClassInheritorsProcessor(session, scopeSession)
         TYPES -> FirTypeResolveProcessor(session, scopeSession)
         STATUS -> FirStatusResolveProcessor(session, scopeSession)
-        ARGUMENTS_OF_ANNOTATIONS -> FirAnnotationArgumentsResolveProcessor(session, scopeSession)
         CONTRACTS -> FirContractResolveProcessor(session, scopeSession)
         IMPLICIT_TYPES_BODY_RESOLVE -> FirImplicitTypeBodyResolveProcessor(session, scopeSession)
         ANNOTATIONS_ARGUMENTS_MAPPING -> FirAnnotationArgumentsMappingProcessor(session, scopeSession)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveProcessor.kt
deleted file mode 100644
index ffeb37d1e20..00000000000
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveProcessor.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.resolve.transformers.plugin
-
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.FirFile
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.resolve.ResolutionMode
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
-import org.jetbrains.kotlin.fir.resolve.transformers.AdapterForResolveProcessor
-import org.jetbrains.kotlin.fir.resolve.transformers.FirTransformerBasedResolveProcessor
-import org.jetbrains.kotlin.fir.visitors.FirTransformer
-import org.jetbrains.kotlin.fir.withFileAnalysisExceptionWrapping
-
-@OptIn(AdapterForResolveProcessor::class)
-class FirAnnotationArgumentsResolveProcessor(
-    session: FirSession,
-    scopeSession: ScopeSession
-) : FirTransformerBasedResolveProcessor(session, scopeSession, FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) {
-    override val transformer: FirTransformer<Any?> = FirAnnotationArgumentsResolveTransformerAdapter(session, scopeSession)
-}
-
-@AdapterForResolveProcessor
-class FirAnnotationArgumentsResolveTransformerAdapter(session: FirSession, scopeSession: ScopeSession) : FirTransformer<Any?>() {
-    private val transformer = FirAnnotationArgumentsResolveTransformer(session, scopeSession, FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS)
-
-    override fun <E : FirElement> transformElement(element: E, data: Any?): E {
-        return element
-    }
-
-    override fun transformFile(file: FirFile, data: Any?): FirFile {
-        return withFileAnalysisExceptionWrapping(file) {
-            file.transform(transformer, ResolutionMode.ContextIndependent)
-        }
-    }
-}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt
deleted file mode 100644
index 509c508913d..00000000000
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.resolve.transformers.plugin
-
-import org.jetbrains.kotlin.KtSourceElement
-import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.containingClassLookupTag
-import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.expressions.*
-import org.jetbrains.kotlin.fir.expressions.builder.buildPropertyAccessExpression
-import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
-import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
-import org.jetbrains.kotlin.fir.references.builder.buildErrorNamedReference
-import org.jetbrains.kotlin.fir.references.builder.buildSimpleNamedReference
-import org.jetbrains.kotlin.fir.references.toResolvedBaseSymbol
-import org.jetbrains.kotlin.fir.resolve.ResolutionMode
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
-import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguouslyResolvedAnnotationArgument
-import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator
-import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculatorForFullBodyResolve
-import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.*
-import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol
-import org.jetbrains.kotlin.fir.visitors.transformSingle
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.StandardClassIds
-
-open class FirAnnotationArgumentsResolveTransformer(
-    session: FirSession,
-    scopeSession: ScopeSession,
-    resolvePhase: FirResolvePhase,
-    outerBodyResolveContext: BodyResolveContext? = null,
-    returnTypeCalculator: ReturnTypeCalculator = ReturnTypeCalculatorForFullBodyResolve.Default,
-    firResolveContextCollector: FirResolveContextCollector? = null,
-) : FirAbstractBodyResolveTransformerDispatcher(
-    session,
-    resolvePhase,
-    implicitTypeOnly = false,
-    scopeSession,
-    outerBodyResolveContext = outerBodyResolveContext,
-    returnTypeCalculator = returnTypeCalculator,
-    firResolveContextCollector = firResolveContextCollector,
-) {
-    final override val expressionsTransformer: FirExpressionsResolveTransformer =
-        FirExpressionsResolveTransformerForSpecificAnnotations(this)
-
-    final override val declarationsTransformer: FirDeclarationsResolveTransformer =
-        FirDeclarationsResolveTransformerForArgumentAnnotations(this)
-}
-
-private class FirDeclarationsResolveTransformerForArgumentAnnotations(
-    transformer: FirAbstractBodyResolveTransformerDispatcher
-) : FirDeclarationsResolveTransformer(transformer) {
-    override fun withFile(file: FirFile, action: () -> FirFile): FirFile {
-        return context.withFile(file, components) {
-            action()
-        }
-    }
-
-    override fun transformRegularClass(regularClass: FirRegularClass, data: ResolutionMode): FirRegularClass {
-        regularClass.transformAnnotations(this, data)
-            .transformTypeParameters(transformer, data)
-            .transformSuperTypeRefs(transformer, data)
-
-        withRegularClass(regularClass) {
-            regularClass.transformDeclarations(transformer, data)
-        }
-
-        return regularClass
-    }
-
-    override fun withRegularClass(regularClass: FirRegularClass, action: () -> FirRegularClass): FirRegularClass {
-        return context.withContainingClass(regularClass) {
-            context.withRegularClass(regularClass, components) {
-                action()
-            }
-        }
-    }
-
-    override fun transformAnonymousInitializer(
-        anonymousInitializer: FirAnonymousInitializer,
-        data: ResolutionMode
-    ): FirAnonymousInitializer {
-        return anonymousInitializer
-    }
-
-    override fun transformSimpleFunction(
-        simpleFunction: FirSimpleFunction,
-        data: ResolutionMode
-    ): FirSimpleFunction {
-        simpleFunction
-            .transformReturnTypeRef(transformer, data)
-            .transformReceiverParameter(transformer, data)
-            .transformValueParameters(transformer, data)
-            .transformAnnotations(transformer, data)
-            .transformTypeParameters(transformer, data)
-        return simpleFunction
-    }
-
-    override fun transformConstructor(constructor: FirConstructor, data: ResolutionMode): FirConstructor {
-        constructor
-            .transformReturnTypeRef(transformer, data)
-            .transformReceiverParameter(transformer, data)
-            .transformValueParameters(transformer, data)
-            .transformAnnotations(transformer, data)
-        return constructor
-    }
-
-    override fun transformErrorPrimaryConstructor(
-        errorPrimaryConstructor: FirErrorPrimaryConstructor,
-        data: ResolutionMode,
-    ): FirErrorPrimaryConstructor = transformConstructor(errorPrimaryConstructor, data) as FirErrorPrimaryConstructor
-
-    override fun transformValueParameter(valueParameter: FirValueParameter, data: ResolutionMode): FirValueParameter {
-        valueParameter
-            .transformAnnotations(transformer, data)
-            .transformReturnTypeRef(transformer, data)
-        return valueParameter
-    }
-
-    override fun transformProperty(property: FirProperty, data: ResolutionMode): FirProperty {
-        property
-            .transformAnnotations(transformer, data)
-            .transformReceiverParameter(transformer, data)
-            .transformReturnTypeRef(transformer, data)
-            .transformGetter(transformer, data)
-            .transformSetter(transformer, data)
-            .transformTypeParameters(transformer, data)
-            .transformBackingField(transformer, data)
-
-        return property
-    }
-
-    override fun transformBackingField(backingField: FirBackingField, data: ResolutionMode): FirBackingField {
-        backingField.transformAnnotations(transformer, data)
-        return backingField
-    }
-
-    override fun transformPropertyAccessor(
-        propertyAccessor: FirPropertyAccessor,
-        data: ResolutionMode
-    ): FirPropertyAccessor {
-        propertyAccessor
-            .transformValueParameters(transformer, data)
-            .transformReturnTypeRef(transformer, data)
-            .transformReceiverParameter(transformer, data)
-            .transformReturnTypeRef(transformer, data)
-            .transformAnnotations(transformer, data)
-        return propertyAccessor
-    }
-
-    override fun transformDeclarationStatus(declarationStatus: FirDeclarationStatus, data: ResolutionMode): FirDeclarationStatus {
-        return declarationStatus
-    }
-
-    override fun transformEnumEntry(enumEntry: FirEnumEntry, data: ResolutionMode): FirEnumEntry {
-        context.forEnumEntry {
-            enumEntry
-                .transformAnnotations(transformer, data)
-                .transformReceiverParameter(transformer, data)
-                .transformReturnTypeRef(transformer, data)
-                .transformTypeParameters(transformer, data)
-        }
-        return enumEntry
-    }
-
-    override fun transformReceiverParameter(receiverParameter: FirReceiverParameter, data: ResolutionMode): FirReceiverParameter {
-        return receiverParameter.transformAnnotations(transformer, data).transformTypeRef(transformer, data)
-    }
-
-    override fun transformField(field: FirField, data: ResolutionMode): FirField {
-        return field.transformAnnotations(transformer, data)
-    }
-
-    override fun transformTypeAlias(typeAlias: FirTypeAlias, data: ResolutionMode): FirTypeAlias {
-        typeAlias.transformAnnotations(transformer, data)
-        typeAlias.expandedTypeRef.transformSingle(transformer, data)
-        return typeAlias
-    }
-
-    override fun transformScript(script: FirScript, data: ResolutionMode): FirScript {
-        return script
-    }
-}
-
-abstract class AbstractFirExpressionsResolveTransformerForAnnotations(transformer: FirAbstractBodyResolveTransformerDispatcher) :
-    FirExpressionsResolveTransformer(transformer) {
-
-    override fun transformAnnotation(annotation: FirAnnotation, data: ResolutionMode): FirStatement {
-        dataFlowAnalyzer.enterAnnotation()
-        annotation.transformChildren(transformer, ResolutionMode.ContextDependent)
-        dataFlowAnalyzer.exitAnnotation()
-        return annotation
-    }
-
-    override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: ResolutionMode): FirStatement {
-        return transformAnnotation(annotationCall, data)
-    }
-
-    override fun transformErrorAnnotationCall(errorAnnotationCall: FirErrorAnnotationCall, data: ResolutionMode): FirStatement {
-        return transformAnnotation(errorAnnotationCall, data)
-    }
-
-    override fun transformExpression(expression: FirExpression, data: ResolutionMode): FirStatement {
-        return expression.transformChildren(transformer, data) as FirStatement
-    }
-
-    override fun FirQualifiedAccessExpression.isAcceptableResolvedQualifiedAccess(): Boolean {
-        return calleeReference !is FirErrorNamedReference
-    }
-
-    abstract override fun resolveQualifiedAccessAndSelectCandidate(
-        qualifiedAccessExpression: FirQualifiedAccessExpression,
-        isUsedAsReceiver: Boolean,
-        callSite: FirElement,
-    ): FirStatement
-
-    override fun transformFunctionCall(functionCall: FirFunctionCall, data: ResolutionMode): FirStatement {
-        return functionCall
-    }
-
-    override fun transformBlock(block: FirBlock, data: ResolutionMode): FirStatement {
-        return block
-    }
-
-    override fun transformThisReceiverExpression(
-        thisReceiverExpression: FirThisReceiverExpression,
-        data: ResolutionMode
-    ): FirStatement {
-        return thisReceiverExpression
-    }
-
-    override fun transformComparisonExpression(
-        comparisonExpression: FirComparisonExpression,
-        data: ResolutionMode
-    ): FirStatement {
-        return comparisonExpression
-    }
-
-    override fun transformTypeOperatorCall(
-        typeOperatorCall: FirTypeOperatorCall,
-        data: ResolutionMode
-    ): FirStatement {
-        return typeOperatorCall
-    }
-
-    override fun transformCheckNotNullCall(
-        checkNotNullCall: FirCheckNotNullCall,
-        data: ResolutionMode
-    ): FirStatement {
-        return checkNotNullCall
-    }
-
-    override fun transformBinaryLogicExpression(
-        binaryLogicExpression: FirBinaryLogicExpression,
-        data: ResolutionMode
-    ): FirStatement {
-        return binaryLogicExpression
-    }
-
-    override fun transformVariableAssignment(
-        variableAssignment: FirVariableAssignment,
-        data: ResolutionMode
-    ): FirStatement {
-        return variableAssignment
-    }
-
-    override fun transformCallableReferenceAccess(
-        callableReferenceAccess: FirCallableReferenceAccess,
-        data: ResolutionMode
-    ): FirStatement {
-        return callableReferenceAccess
-    }
-
-    override fun transformDelegatedConstructorCall(
-        delegatedConstructorCall: FirDelegatedConstructorCall,
-        data: ResolutionMode
-    ): FirStatement {
-        return delegatedConstructorCall
-    }
-
-    override fun transformAugmentedArraySetCall(
-        augmentedArraySetCall: FirAugmentedArraySetCall,
-        data: ResolutionMode
-    ): FirStatement {
-        return augmentedArraySetCall
-    }
-
-    override fun transformArrayLiteral(arrayLiteral: FirArrayLiteral, data: ResolutionMode): FirStatement {
-        arrayLiteral.transformChildren(transformer, data)
-        return arrayLiteral
-    }
-
-    override fun transformAnonymousObjectExpression(
-        anonymousObjectExpression: FirAnonymousObjectExpression,
-        data: ResolutionMode,
-    ): FirStatement {
-        return anonymousObjectExpression
-    }
-
-    override fun transformAnonymousFunctionExpression(
-        anonymousFunctionExpression: FirAnonymousFunctionExpression,
-        data: ResolutionMode,
-    ): FirStatement {
-        return anonymousFunctionExpression
-    }
-
-    override fun shouldComputeTypeOfGetClassCallWithNotQualifierInLhs(getClassCall: FirGetClassCall): Boolean {
-        return false
-    }
-}
-
-private class FirExpressionsResolveTransformerForSpecificAnnotations(transformer: FirAbstractBodyResolveTransformerDispatcher) :
-    AbstractFirExpressionsResolveTransformerForAnnotations(transformer) {
-
-    override fun resolveQualifiedAccessAndSelectCandidate(
-        qualifiedAccessExpression: FirQualifiedAccessExpression,
-        isUsedAsReceiver: Boolean,
-        callSite: FirElement,
-    ): FirStatement {
-        return callResolver.resolveOnlyEnumOrQualifierAccessAndSelectCandidate(qualifiedAccessExpression, isUsedAsReceiver)
-    }
-
-}
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt
index 08ae67adae8..dc0a6caad50 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt
@@ -15,7 +15,6 @@ enum class FirResolvePhase(val noProcessor: Boolean = false) {
     TYPES,
     STATUS,
     EXPECT_ACTUAL_MATCHING,
-    ARGUMENTS_OF_ANNOTATIONS,
     CONTRACTS,
     IMPLICIT_TYPES_BODY_RESOLVE,
     ANNOTATIONS_ARGUMENTS_MAPPING,