From 38524f6b154a9f02b28d0e1c5f89b7791f918906 Mon Sep 17 00:00:00 2001
From: Dmitrii Gridin <dmitry.gridin@jetbrains.com>
Date: Tue, 31 Oct 2023 14:02:29 +0100
Subject: [PATCH] [LL FIR] correctly calculate lazy bodies for delegated
 properties

We should rebind symbols from generated constructions to the original
ones as we already did for regular bodies like (PsiRawFirBuilder.bindFunctionTarget).
This commit also removed bodies for generated accessors as a bonus

^KT-61491 Fixed
---
 .../lazy/resolve/FirLazyBodiesCalculator.kt   | 382 +++++++++++++++++-
 .../level/api/fir/util/stateKeeperUtils.kt    |   1 -
 ...onsOnPropertyDelegate.out_of_src_roots.txt |  36 +-
 ...rRequiredAnnotationsOnPropertyDelegate.txt |  36 +-
 ...redAnnotationsOnPropertyDelegateScript.txt |  37 +-
 .../testData/lazyResolve/delegates.txt        | 276 ++++---------
 .../testData/lazyResolve/delegatesScript.txt  | 277 ++++---------
 .../testData/lazyResolve/lazyProperty.txt     |  44 +-
 .../lazyResolve/lazyPropertyScript.txt        |  45 +--
 .../delegateWithAnnotationOnAccessor.txt      |  72 +---
 ...thAnnotationOnAccessorWithExplicitType.txt |  88 +---
 .../properties/getterWithDelegation.txt       |  44 +-
 .../properties/getterWithDelegationScript.txt |  45 +--
 .../kotlin/fir/builder/PsiRawFirBuilder.kt    |   7 +-
 .../annotationOnField.lazyBodies.txt          |   4 +-
 .../declarations/delegates.lazyBodies.txt     |  16 +-
 ...alDeclarationWithExpression.lazyBodies.txt |   4 +-
 .../kotlin/fir/builder/ConversionUtils.kt     |   6 +-
 .../tests/deprecated/propertyUsage.fir.kt     |   3 -
 .../tests/deprecated/propertyUsage.kt         |   3 -
 20 files changed, 635 insertions(+), 791 deletions(-)

diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
index b04138916a9..bcba9cba205 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiElement
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
+import org.jetbrains.kotlin.KtFakeSourceElementKind
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDesignation
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.builder.PsiRawFirBuilder
@@ -19,12 +20,28 @@ import org.jetbrains.kotlin.fir.declarations.annotationPlatformSupport
 import org.jetbrains.kotlin.fir.declarations.utils.getExplicitBackingField
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.expressions.impl.FirLazyDelegatedConstructorCall
+import org.jetbrains.kotlin.fir.expressions.impl.FirSingleExpressionBlock
 import org.jetbrains.kotlin.fir.extensions.registeredPluginAnnotations
+import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference
+import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
+import org.jetbrains.kotlin.fir.references.builder.buildDelegateFieldReference
+import org.jetbrains.kotlin.fir.references.builder.buildImplicitThisReference
+import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
 import org.jetbrains.kotlin.fir.scopes.kotlinScopeProvider
+import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.builder.buildTypeProjectionWithVariance
+import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
+import org.jetbrains.kotlin.fir.utils.exceptions.withFirEntry
+import org.jetbrains.kotlin.fir.utils.exceptions.withFirSymbolEntry
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.transformSingle
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.types.Variance
+import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment
+import org.jetbrains.kotlin.utils.exceptions.requireWithAttachment
 
 internal object FirLazyBodiesCalculator {
     fun calculateBodies(designation: FirDesignation) {
@@ -78,7 +95,7 @@ internal object FirLazyBodiesCalculator {
 
 private inline fun <reified T : FirDeclaration> revive(
     designation: FirDesignation,
-    psi: PsiElement? = designation.target.psi
+    psi: PsiElement? = designation.target.psi,
 ): T {
     val session = designation.target.moduleData.session
 
@@ -180,29 +197,366 @@ private fun calculateLazyBodyForProperty(designation: FirDesignation) {
     val firProperty = designation.target as FirProperty
     if (!needCalculatingLazyBodyForProperty(firProperty)) return
 
-    val newProperty = revive<FirProperty>(designation, firProperty.unwrapFakeOverridesOrDelegated().psi)
+    val recreatedProperty = revive<FirProperty>(designation, firProperty.unwrapFakeOverridesOrDelegated().psi)
 
     firProperty.getter?.let { getter ->
-        val newGetter = newProperty.getter!!
-        replaceLazyContractDescription(getter, newGetter)
-        replaceLazyBody(getter, newGetter)
+        val recreatedGetter = recreatedProperty.getter!!
+        replaceLazyContractDescription(getter, recreatedGetter)
+        replaceLazyBody(getter, recreatedGetter)
+        rebindDelegatedAccessorBody(newTarget = getter, oldTarget = recreatedGetter)
     }
 
     firProperty.setter?.let { setter ->
-        val newSetter = newProperty.setter!!
-        replaceLazyContractDescription(setter, newSetter)
-        replaceLazyBody(setter, newSetter)
+        val recreatedSetter = recreatedProperty.setter!!
+        replaceLazyContractDescription(setter, recreatedSetter)
+        replaceLazyBody(setter, recreatedSetter)
+        rebindDelegatedAccessorBody(newTarget = setter, oldTarget = recreatedSetter)
     }
 
-    replaceLazyInitializer(firProperty, newProperty)
-    replaceLazyDelegate(firProperty, newProperty)
+    replaceLazyInitializer(firProperty, recreatedProperty)
+    replaceLazyDelegate(firProperty, recreatedProperty)
+    rebindDelegate(newTarget = firProperty, oldTarget = recreatedProperty)
 
     firProperty.getExplicitBackingField()?.let { backingField ->
-        val newBackingField = newProperty.getExplicitBackingField()!!
+        val newBackingField = recreatedProperty.getExplicitBackingField()!!
         replaceLazyInitializer(backingField, newBackingField)
     }
 }
 
+/**
+ * This function is required to correctly rebind symbols
+ * after [generateAccessorsByDelegate][org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate]
+ * for correct work
+ *
+ * @see org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate
+ */
+private fun rebindDelegate(newTarget: FirProperty, oldTarget: FirProperty) {
+    val delegate = newTarget.delegate ?: return
+    requireWithAttachment(
+        delegate is FirWrappedDelegateExpression,
+        { "Unexpected delegate type: ${delegate::class.simpleName}" },
+    ) {
+        withFirEntry("newTarget", newTarget)
+        withFirEntry("oldTarget", oldTarget)
+        withFirEntry("delegate", delegate)
+    }
+
+    val delegateProvider = delegate.delegateProvider
+    requireWithAttachment(
+        delegateProvider is FirFunctionCall,
+        { "Unexpected delegate provider type: ${delegateProvider::class.simpleName}" },
+    ) {
+        withFirEntry("newTarget", newTarget)
+        withFirEntry("oldTarget", oldTarget)
+        withFirEntry("expression", delegateProvider)
+    }
+
+    rebindArgumentList(
+        delegateProvider.argumentList,
+        newTarget = newTarget.symbol,
+        oldTarget = oldTarget.symbol,
+        isSetter = false,
+        canHavePropertySymbolAsThisReference = false,
+    )
+}
+
+/**
+ * This function is required to correctly rebind symbols
+ * after [generateAccessorsByDelegate][org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate]
+ * for correct work
+ *
+ * @see org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate
+ * @see rebindDelegate
+ */
+private fun rebindDelegatedAccessorBody(newTarget: FirPropertyAccessor, oldTarget: FirPropertyAccessor) {
+    if (newTarget.source?.kind != KtFakeSourceElementKind.DelegatedPropertyAccessor) return
+    val body = newTarget.body
+    requireWithAttachment(
+        body is FirSingleExpressionBlock,
+        { "Unexpected body for generated accessor ${body?.let { it::class.simpleName }}" },
+    ) {
+        withFirSymbolEntry("newTarget", newTarget.propertySymbol)
+        withFirSymbolEntry("oldTarget", oldTarget.propertySymbol)
+        body?.let { withFirEntry("body", it) } ?: withEntry("body", "null")
+    }
+
+    val returnExpression = body.statement
+    rebindReturnExpression(returnExpression = returnExpression, newTarget = newTarget, oldTarget = oldTarget)
+}
+
+private fun rebindReturnExpression(returnExpression: FirStatement, newTarget: FirPropertyAccessor, oldTarget: FirPropertyAccessor) {
+    requireWithAttachment(returnExpression is FirReturnExpression, { "Unexpected single statement" }) {
+        withFirSymbolEntry("newTarget", newTarget.propertySymbol)
+        withFirSymbolEntry("oldTarget", oldTarget.propertySymbol)
+        withFirEntry("expression", returnExpression)
+    }
+
+    val target = returnExpression.target
+    requireWithAttachment(target.labeledElement == oldTarget, { "Unexpected return target" }) {
+        withFirSymbolEntry("newTarget", newTarget.propertySymbol)
+        withFirSymbolEntry("oldTarget", oldTarget.propertySymbol)
+        withFirEntry("target", target.labeledElement)
+    }
+
+    target.bind(newTarget)
+
+    val functionCall = returnExpression.result
+    rebindFunctionCall(functionCall, newTarget, oldTarget)
+}
+
+private fun rebindFunctionCall(functionCall: FirExpression, newTarget: FirPropertyAccessor, oldTarget: FirPropertyAccessor) {
+    requireWithAttachment(functionCall is FirFunctionCall, { "Unexpected result expression ${functionCall::class.simpleName}" }) {
+        withFirSymbolEntry("newTarget", newTarget.propertySymbol)
+        withFirSymbolEntry("oldTarget", oldTarget.propertySymbol)
+        withFirEntry("functionCall", functionCall)
+    }
+
+    rebindDelegateAccess(
+        expression = functionCall.explicitReceiver,
+        newPropertySymbol = newTarget.propertySymbol,
+        oldPropertySymbol = oldTarget.propertySymbol,
+    )
+
+    rebindArgumentList(
+        argumentList = functionCall.argumentList,
+        newTarget = newTarget.propertySymbol,
+        oldTarget = oldTarget.propertySymbol,
+        isSetter = newTarget.isSetter,
+        canHavePropertySymbolAsThisReference = true,
+    )
+}
+
+/**
+ * To cover `thisRef` function
+ *
+ * @see org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate
+ */
+private fun rebindThisRef(
+    expression: FirExpression,
+    newTarget: FirPropertySymbol,
+    oldTarget: FirPropertySymbol,
+    canHavePropertySymbolAsThisReference: Boolean,
+) {
+    if (expression is FirConstExpression<*>) return
+
+    requireWithAttachment(
+        expression is FirThisReceiverExpression,
+        { "Unexpected this reference expression: ${expression::class.simpleName}" },
+    ) {
+        withFirSymbolEntry("newTarget", newTarget)
+        withFirSymbolEntry("oldTarget", oldTarget)
+        withFirEntry("expression", expression)
+    }
+
+    val boundSymbol = expression.calleeReference.boundSymbol
+    if (boundSymbol is FirClassSymbol<*>) return
+    requireWithAttachment(
+        canHavePropertySymbolAsThisReference,
+        { "Class bound symbol is not found: ${boundSymbol?.let { it::class.simpleName }}" },
+    ) {
+        withFirSymbolEntry("newTarget", newTarget)
+        withFirSymbolEntry("oldTarget", oldTarget)
+        boundSymbol?.let { withFirSymbolEntry("boundSymbol", boundSymbol) }
+    }
+
+    requireWithAttachment(boundSymbol == oldTarget, { "Unexpected bound symbol: ${boundSymbol?.let { it::class.simpleName }}" }) {
+        withFirSymbolEntry("newTarget", newTarget)
+        withFirSymbolEntry("oldTarget", oldTarget)
+        boundSymbol?.let { withFirSymbolEntry("boundSymbol", boundSymbol) }
+    }
+
+    expression.replaceCalleeReference(buildImplicitThisReference {
+        this.boundSymbol = newTarget
+    })
+}
+
+private fun rebindArgumentList(
+    argumentList: FirArgumentList,
+    newTarget: FirPropertySymbol,
+    oldTarget: FirPropertySymbol,
+    isSetter: Boolean,
+    canHavePropertySymbolAsThisReference: Boolean,
+) {
+    val arguments = argumentList.arguments
+    val expectedSize = 2 + if (isSetter) 1 else 0
+    requireWithAttachment(
+        arguments.size == expectedSize,
+        { "Unexpected arguments size. Expected: $expectedSize, actual: ${arguments.size}" },
+    ) {
+        withFirSymbolEntry("newTarget", newTarget)
+        withFirSymbolEntry("oldTarget", oldTarget)
+        withFirEntry("expression", argumentList)
+    }
+
+    rebindThisRef(
+        expression = arguments[0],
+        newTarget = newTarget,
+        oldTarget = oldTarget,
+        canHavePropertySymbolAsThisReference = canHavePropertySymbolAsThisReference,
+    )
+
+    rebindPropertyRef(expression = arguments[1], newPropertySymbol = newTarget, oldPropertySymbol = oldTarget)
+
+    if (isSetter) {
+        rebindSetterParameter(expression = arguments[2], newPropertySymbol = newTarget, oldPropertySymbol = oldTarget)
+    }
+}
+
+/**
+ * To cover third argument in setter body
+ *
+ * @see org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate
+ */
+private fun rebindSetterParameter(expression: FirExpression, newPropertySymbol: FirPropertySymbol, oldPropertySymbol: FirPropertySymbol) {
+    requireWithAttachment(
+        expression is FirPropertyAccessExpression,
+        { "Unexpected third argument: ${expression::class.simpleName}" }) {
+        withFirSymbolEntry("newTarget", newPropertySymbol)
+        withFirSymbolEntry("oldTarget", oldPropertySymbol)
+        withFirEntry("expression", expression)
+    }
+
+    val calleeReference = expression.resolvedCalleeReference(newPropertySymbol = newPropertySymbol, oldPropertySymbol = oldPropertySymbol)
+    val resolvedParameterSymbol = calleeReference.resolvedSymbol
+    val oldValueParameterSymbol = oldPropertySymbol.setterSymbol?.valueParameterSymbols?.first()
+    requireWithAttachment(
+        resolvedParameterSymbol == oldValueParameterSymbol,
+        { "Unexpected symbol: ${resolvedParameterSymbol::class.simpleName}" },
+    ) {
+        withFirEntry("expression", expression)
+        withFirSymbolEntry("actualOldParameter", resolvedParameterSymbol)
+        oldValueParameterSymbol?.let { withFirSymbolEntry("expectedOldParameter", it) }
+        withFirSymbolEntry("oldProperty", oldPropertySymbol)
+        withFirSymbolEntry("newProperty", newPropertySymbol)
+    }
+
+    expression.replaceCalleeReference(buildResolvedNamedReference {
+        source = calleeReference.source
+        name = calleeReference.name
+        resolvedSymbol = newPropertySymbol.setterSymbol?.valueParameterSymbols?.first() ?: errorWithAttachment("Parameter is not found") {
+            withFirSymbolEntry("oldProperty", oldPropertySymbol)
+            withFirSymbolEntry("newProperty", newPropertySymbol)
+        }
+    })
+}
+
+private fun FirQualifiedAccessExpression.resolvedCalleeReference(
+    newPropertySymbol: FirPropertySymbol,
+    oldPropertySymbol: FirPropertySymbol,
+): FirResolvedNamedReference {
+    val calleeReference = calleeReference
+    requireWithAttachment(
+        calleeReference is FirResolvedNamedReference,
+        { "Unexpected callee reference: ${calleeReference::class.simpleName}" },
+    ) {
+        withFirSymbolEntry("oldProperty", oldPropertySymbol)
+        withFirSymbolEntry("newProperty", newPropertySymbol)
+        withFirEntry("calleeReference", calleeReference)
+    }
+
+    return calleeReference
+}
+
+/**
+ * To cover `propertyRef` function
+ *
+ * @see org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate
+ */
+private fun rebindPropertyRef(
+    expression: FirExpression,
+    newPropertySymbol: FirPropertySymbol,
+    oldPropertySymbol: FirPropertySymbol,
+) {
+    requireWithAttachment(
+        expression is FirCallableReferenceAccess,
+        { "Unexpected second argument: ${expression::class.simpleName}" },
+    ) {
+        withFirSymbolEntry("newTarget", newPropertySymbol)
+        withFirSymbolEntry("oldTarget", oldPropertySymbol)
+        withFirEntry("expression", expression)
+    }
+
+    val calleeReference = expression.resolvedCalleeReference(newPropertySymbol = newPropertySymbol, oldPropertySymbol = oldPropertySymbol)
+    val resolvedPropertySymbol = calleeReference.resolvedSymbol
+    requireWithAttachment(
+        resolvedPropertySymbol == oldPropertySymbol,
+        { "Unexpected symbol: ${resolvedPropertySymbol::class.simpleName}" },
+    ) {
+        withFirEntry("expression", expression)
+        withFirSymbolEntry("actualOldProperty", resolvedPropertySymbol)
+        withFirSymbolEntry("expectedOldProperty", oldPropertySymbol)
+        withFirSymbolEntry("newProperty", newPropertySymbol)
+    }
+
+    expression.replaceCalleeReference(buildResolvedNamedReference {
+        source = calleeReference.source
+        name = calleeReference.name
+        resolvedSymbol = newPropertySymbol
+    })
+
+    expression.replaceTypeArguments(newPropertySymbol.fir.typeParameters.map {
+        buildTypeProjectionWithVariance {
+            source = expression.source
+            variance = Variance.INVARIANT
+            typeRef = buildResolvedTypeRef {
+                type = ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), false)
+            }
+        }
+    })
+}
+
+/**
+ * To cover `delegateAccess` function
+ *
+ * @see org.jetbrains.kotlin.fir.builder.generateAccessorsByDelegate
+ */
+private fun rebindDelegateAccess(expression: FirExpression?, newPropertySymbol: FirPropertySymbol, oldPropertySymbol: FirPropertySymbol) {
+    requireWithAttachment(
+        expression is FirPropertyAccessExpression,
+        { "Unexpected delegate accessor expression: ${expression?.let { it::class.simpleName }}" },
+    ) {
+        withFirSymbolEntry("newTarget", newPropertySymbol)
+        withFirSymbolEntry("oldTarget", oldPropertySymbol)
+        expression?.let { withFirEntry("expression", it) }
+    }
+
+    val delegateFieldReference = expression.calleeReference
+    requireWithAttachment(
+        delegateFieldReference is FirDelegateFieldReference,
+        { "Unexpected callee reference: ${delegateFieldReference::class.simpleName}" },
+    ) {
+        withFirSymbolEntry("newTarget", newPropertySymbol)
+        withFirSymbolEntry("oldTarget", oldPropertySymbol)
+        withFirEntry("delegateFieldReference", delegateFieldReference)
+    }
+
+    requireWithAttachment(
+        delegateFieldReference.resolvedSymbol == oldPropertySymbol.delegateFieldSymbol,
+        { "Unexpected delegate field symbol" }
+    ) {
+        withFirSymbolEntry("newTarget", newPropertySymbol)
+        withFirSymbolEntry("oldTarget", oldPropertySymbol)
+        withFirSymbolEntry("field", delegateFieldReference.resolvedSymbol)
+    }
+
+    expression.replaceCalleeReference(buildDelegateFieldReference {
+        source = delegateFieldReference.source
+        resolvedSymbol = newPropertySymbol.delegateFieldSymbol ?: errorWithAttachment("Delegate field is missing") {
+            withFirSymbolEntry("newTarget", newPropertySymbol)
+            withFirSymbolEntry("oldTarget", oldPropertySymbol)
+        }
+    })
+
+    expression.dispatchReceiver?.let {
+        rebindThisRef(
+            expression = it,
+            newTarget = newPropertySymbol,
+            oldTarget = oldPropertySymbol,
+            canHavePropertySymbolAsThisReference = false,
+        )
+    }
+}
+
 private fun calculateLazyInitializerForEnumEntry(designation: FirDesignation) {
     val enumEntry = designation.target as FirEnumEntry
     require(enumEntry.initializer is FirLazyExpression)
@@ -452,8 +806,10 @@ private abstract class FirLazyBodiesCalculatorTransformer : FirTransformer<Persi
         return constructor
     }
 
-    override fun transformErrorPrimaryConstructor(errorPrimaryConstructor: FirErrorPrimaryConstructor, data: PersistentList<FirRegularClass>) =
-        transformConstructor(errorPrimaryConstructor, data)
+    override fun transformErrorPrimaryConstructor(
+        errorPrimaryConstructor: FirErrorPrimaryConstructor,
+        data: PersistentList<FirRegularClass>,
+    ) = transformConstructor(errorPrimaryConstructor, data)
 
     override fun transformProperty(property: FirProperty, data: PersistentList<FirRegularClass>): FirProperty {
         if (needCalculatingLazyBodyForProperty(property)) {
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/stateKeeperUtils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/stateKeeperUtils.kt
index c5003e0e892..62d18a03f87 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/stateKeeperUtils.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/stateKeeperUtils.kt
@@ -36,7 +36,6 @@ private fun isLazyStatement(fir: FirStatement): Boolean {
 
 private val SPECIAL_BODY_CALLABLE_SOURCE_KINDS = setOf(
     KtFakeSourceElementKind.DefaultAccessor,
-    KtFakeSourceElementKind.DelegatedPropertyAccessor,
     KtFakeSourceElementKind.ImplicitConstructor,
     KtFakeSourceElementKind.PropertyFromParameter,
     KtFakeSourceElementKind.DataClassGeneratedMembers,
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 3e02d55ce55..ce3dd973f15 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
@@ -10,9 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](LAZY_EXPRESSION) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -26,9 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](LAZY_EXPRESSION) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -42,9 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -58,9 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -74,9 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -90,9 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(TYPES)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(TYPES)] get(): <implicit> { LAZY_BLOCK }
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -106,9 +94,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public [ResolvedTo(STATUS)] get(): <implicit> { LAZY_BLOCK }
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -122,9 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -138,9 +122,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     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|)
-        }
+        public [ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt
index 3d24956d6b6..807a5cabdbf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegate.txt
@@ -10,9 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](LAZY_EXPRESSION) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -26,9 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](LAZY_EXPRESSION) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -42,9 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -58,9 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -74,9 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -90,9 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public? [ResolvedTo(TYPES)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public? [ResolvedTo(TYPES)] get(): <implicit> { LAZY_BLOCK }
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -106,9 +94,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public [ResolvedTo(STATUS)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public [ResolvedTo(STATUS)] get(): <implicit> { LAZY_BLOCK }
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -122,9 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val memberProperty: <implicit>by LAZY_EXPRESSION
-        public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> {
-            ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-        }
+        public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
@@ -138,9 +122,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
 
     }
     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|)
-        }
+        public [ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegate.kt
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
index 781a096d84e..6b5f10f9ea2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
@@ -15,9 +15,7 @@ FILE: [ResolvedTo(RAW_FIR)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](LAZY_EXPRESSION) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
 
 IMPORTS:
@@ -37,9 +35,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:Deprecated[Unresolved](LAZY_EXPRESSION) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
@@ -59,9 +55,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
 
 
 COMPANION_GENERATION:
@@ -81,9 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
 
 
 SUPER_TYPES:
@@ -103,9 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(delegate)) @PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
 
 
 TYPES:
@@ -125,9 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public? [ResolvedTo(TYPES)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public? [ResolvedTo(TYPES)] get(): <implicit> { LAZY_BLOCK }
 
 
 STATUS:
@@ -147,9 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public [ResolvedTo(STATUS)] get(): <implicit> { LAZY_BLOCK }
 
 
 EXPECT_ACTUAL_MATCHING:
@@ -169,9 +155,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         field:@PROPERTY_DELEGATE_FIELD:R|kotlin/Deprecated|[Types](String(delegate)) @PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val memberProperty: <implicit>by LAZY_EXPRESSION
-            public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> {
-                ^ D|/memberProperty|.getValue#(Null(null), ::R|/memberProperty|)
-            }
+            public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
 
 
 CONTRACTS:
@@ -191,9 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.
         }
 
         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|)
-            }
+            public [ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -294,3 +276,4 @@ 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/delegates.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt
index 29e3f2a6635..691aafa2b21 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegates.txt
@@ -5,27 +5,15 @@ FILE: [ResolvedTo(RAW_FIR)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -34,27 +22,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -63,27 +39,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -92,27 +56,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -121,27 +73,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -150,27 +90,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -179,27 +107,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -208,27 +124,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -242,27 +146,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -276,27 +168,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 ANNOTATION_ARGUMENTS:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -310,27 +190,15 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     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|)
-        }
+        public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] delegates.kt
@@ -358,20 +226,14 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt
 
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
     public final [ResolvedTo(CONTRACTS)] val valueWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
-        public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
-        }
+        public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
     public final [ResolvedTo(CONTRACTS)] var variableWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
-        public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
-        }
-        public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
-        }
+        public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt
index 72dacfcbade..b9c9c38696e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatesScript.txt
@@ -12,30 +12,18 @@ FILE: [ResolvedTo(RAW_FIR)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 IMPORTS:
@@ -52,30 +40,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
@@ -92,30 +68,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 COMPANION_GENERATION:
@@ -132,30 +96,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 SUPER_TYPES:
@@ -172,30 +124,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 TYPES:
@@ -212,30 +152,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 STATUS:
@@ -252,30 +180,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 EXPECT_ACTUAL_MATCHING:
@@ -292,30 +208,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 CONTRACTS:
@@ -337,30 +241,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -382,30 +274,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 ANNOTATION_ARGUMENTS:
@@ -427,30 +307,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         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? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
         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|)
-            }
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
 
 
 BODY_RESOLVE:
@@ -486,9 +354,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
 
         public final [ResolvedTo(CONTRACTS)] val valueWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
-            public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-                ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
-            }
+            public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
@@ -496,12 +362,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
             }
 
         public final [ResolvedTo(CONTRACTS)] var variableWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
-            public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-                ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
-            }
-            public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
-            }
+            public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
+            public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 
         public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
@@ -569,3 +431,4 @@ 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/lazyProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt
index c5b94d7dc85..4cfc29b365e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/lazyProperty.txt
@@ -20,9 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] lazyProperty.kt
         }
 
         public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
     }
 
@@ -48,9 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
     }
 
@@ -76,9 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val resolveMe: Stringby LAZY_EXPRESSION
-            public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Test] get(): <implicit> {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
     }
 
@@ -104,9 +98,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public? final? [ResolvedTo(COMPANION_GENERATION)] val resolveMe: Stringby LAZY_EXPRESSION
-            public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Test] get(): <implicit> {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
     }
 
@@ -132,9 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public? final? [ResolvedTo(SUPER_TYPES)] val resolveMe: Stringby LAZY_EXPRESSION
-            public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Test] get(): <implicit> {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
     }
 
@@ -160,9 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public? final? [ResolvedTo(TYPES)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public? [ResolvedTo(TYPES)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public? [ResolvedTo(TYPES)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
     }
 
@@ -188,9 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
     }
 
@@ -216,9 +202,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
     }
 
@@ -244,9 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public final [ResolvedTo(CONTRACTS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
     }
 
@@ -272,9 +254,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
     }
 
@@ -300,9 +280,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt
         }
 
         public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-            }
+            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
     }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt
index 816c9ce853e..2a81cb16f36 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/lazyPropertyScript.txt
@@ -28,9 +28,7 @@ FILE: [ResolvedTo(RAW_FIR)] lazyPropertyScript.kts
             }
 
             public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
         }
 
@@ -65,9 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public? final? [ResolvedTo(RAW_FIR)] val resolveMe: Stringby LAZY_EXPRESSION
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
         }
 
@@ -102,9 +98,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val resolveMe: Stringby LAZY_EXPRESSION
-                public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Test] get(): <implicit> {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
         }
 
@@ -139,9 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public? final? [ResolvedTo(COMPANION_GENERATION)] val resolveMe: Stringby LAZY_EXPRESSION
-                public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Test] get(): <implicit> {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
         }
 
@@ -176,9 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public? final? [ResolvedTo(SUPER_TYPES)] val resolveMe: Stringby LAZY_EXPRESSION
-                public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Test] get(): <implicit> {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Test] get(): <implicit> { LAZY_BLOCK }
 
         }
 
@@ -213,9 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public? final? [ResolvedTo(TYPES)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public? [ResolvedTo(TYPES)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public? [ResolvedTo(TYPES)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
         }
 
@@ -250,9 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public final [ResolvedTo(STATUS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
         }
 
@@ -287,9 +273,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
         }
 
@@ -324,9 +308,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public final [ResolvedTo(CONTRACTS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
         }
 
@@ -361,9 +343,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
         }
 
@@ -398,9 +378,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
             }
 
             public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val resolveMe: R|kotlin/String|by LAZY_EXPRESSION
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Test] get(): R|kotlin/String| {
-                    ^ this@R|/Test|.D|/Test.resolveMe|.getValue#(this@R|/Test|, ::R|/Test.resolveMe|)
-                }
+                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Test] get(): R|kotlin/String| { LAZY_BLOCK }
 
         }
 
@@ -497,3 +475,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] lazyPropertyScript.kts
                 }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessor.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessor.txt
index d7436a9f33b..c760a41b4b9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessor.txt
@@ -1,12 +1,8 @@
 RAW_FIR:
 FILE: [ResolvedTo(RAW_FIR)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -30,12 +26,8 @@ FILE: [ResolvedTo(RAW_FIR)] delegateWithAnnotationOnAccessor.kt
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -59,12 +51,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] set([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] set([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -88,12 +76,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] set([ResolvedTo(COMPANION_GENERATION)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] set([ResolvedTo(COMPANION_GENERATION)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -117,12 +101,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] set([ResolvedTo(SUPER_TYPES)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] set([ResolvedTo(SUPER_TYPES)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -146,12 +126,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -175,12 +151,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -204,12 +176,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -233,12 +201,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessor.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var foo: <implicit>by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessorWithExplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessorWithExplicitType.txt
index 6324e6c6dfd..4d227464909 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessorWithExplicitType.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/delegateWithAnnotationOnAccessorWithExplicitType.txt
@@ -1,12 +1,8 @@
 RAW_FIR:
 FILE: [ResolvedTo(RAW_FIR)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] var foo: Intby LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -30,12 +26,8 @@ FILE: [ResolvedTo(RAW_FIR)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] var foo: Intby LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -59,12 +51,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] var foo: Intby LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] set([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] set([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -88,12 +76,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] var foo: Intby LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] set([ResolvedTo(COMPANION_GENERATION)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] set([ResolvedTo(COMPANION_GENERATION)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -117,12 +101,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] var foo: Intby LAZY_EXPRESSION
-        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] set([ResolvedTo(SUPER_TYPES)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
+        @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(SUPER_TYPES)] set([ResolvedTo(SUPER_TYPES)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) <set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -146,12 +126,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] var foo: R|kotlin/Int|by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -175,12 +151,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] var foo: R|kotlin/Int|by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] get(): R|kotlin/Int| {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -204,12 +176,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var foo: R|kotlin/Int|by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -233,12 +201,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(CONTRACTS)] var foo: R|kotlin/Int|by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -262,12 +226,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var foo: R|kotlin/Int|by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     @Repeatable[Unresolved]() 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|>
@@ -291,12 +251,8 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
 ANNOTATION_ARGUMENTS:
 FILE: [ResolvedTo(IMPORTS)] delegateWithAnnotationOnAccessorWithExplicitType.kt
     field:@PROPERTY_DELEGATE_FIELD:R|Anno|[Types](s = String(delegate)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var foo: R|kotlin/Int|by LAZY_EXPRESSION
-        @PROPERTY_GETTER:R|Anno|[Types](s = String(getter)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| {
-            ^ D|/foo|.getValue#(Null(null), ::R|/foo|)
-        }
-        @PROPERTY_SETTER:R|Anno|[Types](s = String(setter)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @SETTER_PARAMETER:R|Anno|[Types](s = String(parameter)) <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ D|/foo|.setValue#(Null(null), ::R|/foo|, R|<local>/foo|)
-        }
+        @PROPERTY_GETTER:R|Anno|[Types](s = String(getter)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
+        @PROPERTY_SETTER:R|Anno|[Types](s = String(setter)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @SETTER_PARAMETER:R|Anno|[Types](s = String(parameter)) <set-?>: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     @R|kotlin/annotation/Repeatable|[Types]() public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
             LAZY_super<R|kotlin/Any|>
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 911809e7414..a3e886e5033 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegation.txt
@@ -1,9 +1,7 @@
 RAW_FIR:
 FILE: [ResolvedTo(RAW_FIR)] getterWithDelegation.kt
     public? final? [ResolvedTo(RAW_FIR)] val one: Intby LAZY_EXPRESSION
-        @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -16,9 +14,7 @@ FILE: [ResolvedTo(RAW_FIR)] getterWithDelegation.kt
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public? final? [ResolvedTo(RAW_FIR)] val one: Intby LAZY_EXPRESSION
-        @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -31,9 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val one: Intby LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -46,9 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public? final? [ResolvedTo(COMPANION_GENERATION)] val one: Intby LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -61,9 +53,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public? final? [ResolvedTo(SUPER_TYPES)] val one: Intby LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -76,9 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public? final? [ResolvedTo(TYPES)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(reason)) public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[Types](String(reason)) public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -91,9 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public final [ResolvedTo(STATUS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(STATUS)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(STATUS)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -106,9 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -121,9 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public final [ResolvedTo(CONTRACTS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -136,9 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
@@ -151,9 +131,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
 ANNOTATION_ARGUMENTS:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegation.kt
     public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-        @R|kotlin/Deprecated|[Types](message = String(reason)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| {
-            ^ D|/one|.getValue#(Null(null), ::R|/one|)
-        }
+        @R|kotlin/Deprecated|[Types](message = String(reason)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
     public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
             LAZY_super<R|kotlin/Any|>
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 432dbb77adf..bf281b824ec 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/getterWithDelegationScript.txt
@@ -5,9 +5,7 @@ FILE: [ResolvedTo(RAW_FIR)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] val one: Intby LAZY_EXPRESSION
-            @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -26,9 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] val one: Intby LAZY_EXPRESSION
-            @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @Deprecated[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -47,9 +43,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val one: Intby LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -68,9 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(COMPANION_GENERATION)] val one: Intby LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -89,9 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(SUPER_TYPES)] val one: Intby LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(reason)) public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -110,9 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(TYPES)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(reason)) public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[Types](String(reason)) public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -131,9 +119,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(STATUS)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(STATUS)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -152,9 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -173,9 +157,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(CONTRACTS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -194,9 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[Types](String(reason)) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -215,9 +195,7 @@ FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val one: R|kotlin/Int|by LAZY_EXPRESSION
-            @R|kotlin/Deprecated|[Types](message = String(reason)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| {
-                ^ D|/one|.getValue#(Null(null), ::R|/one|)
-            }
+            @R|kotlin/Deprecated|[Types](message = String(reason)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK }
 
         public? final? [ResolvedTo(RAW_FIR)] class Prp : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Prp] constructor(): R|Prp| {
@@ -273,3 +251,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] getterWithDelegationScript.kts
             }
 
         }
+
diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
index 50560616097..8bffd56120f 100644
--- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
+++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
@@ -2057,9 +2057,9 @@ open class PsiRawFirBuilder(
                                 expression = delegateExpression
                             }
 
-                            val lazyDelegateExpression: FirLazyExpression? = buildOrLazy(
-                                build = { null },
-                                lazy = { buildLazyExpression { source = delegateBuilder.source } },
+                            val (lazyDelegateExpression: FirLazyExpression?, lazyBody: FirLazyBlock?) = buildOrLazy(
+                                build = { null to null },
+                                lazy = { buildLazyExpression { source = delegateBuilder.source } to buildLazyBlock() },
                             )
 
                             generateAccessorsByDelegate(
@@ -2069,6 +2069,7 @@ open class PsiRawFirBuilder(
                                 context,
                                 isExtension = receiverTypeReference != null,
                                 lazyDelegateExpression = lazyDelegateExpression,
+                                lazyBodyForGeneratedAccessors = lazyBody,
                             )
                         }
                     }
diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationOnField.lazyBodies.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationOnField.lazyBodies.txt
index 46f370e5f42..ff24f46acb7 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationOnField.lazyBodies.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationOnField.lazyBodies.txt
@@ -25,9 +25,7 @@ FILE: annotationOnField.kt
             protected get(): String
 
         field:@FIELD:Ann() protected final? val delegatedProperty: Stringby LAZY_EXPRESSION
-            protected get(): <implicit> {
-                ^ this@R|/SomeClass|.D|/SomeClass.delegatedProperty|.getValue#(this@R|/SomeClass|, ::R|/SomeClass.delegatedProperty|)
-            }
+            protected get(): <implicit> { LAZY_BLOCK }
 
         field:@FIELD:Ann() public? final? val propertyWithCustomGetter: Int
             public? get(): Int { LAZY_BLOCK }
diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/delegates.lazyBodies.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/delegates.lazyBodies.txt
index e794593cb0f..0a7b6e7fc02 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/delegates.lazyBodies.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/delegates.lazyBodies.txt
@@ -1,21 +1,13 @@
 FILE: delegates.kt
     public? final? val x: Intby LAZY_EXPRESSION
-        public? get(): <implicit> {
-            ^ D|/x|.getValue#(Null(null), ::R|/x|)
-        }
+        public? get(): <implicit> { LAZY_BLOCK }
     public? final? val delegate: <implicit> = LAZY_EXPRESSION
         public? get(): <implicit>
     public? final? val value: <implicit>by LAZY_EXPRESSION
-        public? get(): <implicit> {
-            ^ D|/value|.getValue#(Null(null), ::R|/value|)
-        }
+        public? get(): <implicit> { LAZY_BLOCK }
     public? final? var variable: <implicit>by LAZY_EXPRESSION
-        public? get(): <implicit> {
-            ^ D|/variable|.getValue#(Null(null), ::R|/variable|)
-        }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
-            ^ D|/variable|.setValue#(Null(null), ::R|/variable|, R|<local>/variable|)
-        }
+        public? get(): <implicit> { LAZY_BLOCK }
+        public? set(<set-?>: <implicit>): R|kotlin/Unit| { LAZY_BLOCK }
     public? final? interface Base : R|kotlin/Any| {
     }
     public? final? class Derived : Base {
diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt
index daaa6b12b81..b398e278c7d 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt
@@ -1,5 +1,3 @@
 FILE: localDeclarationWithExpression.kt
     private final? val nonLocalProperty: List<XXX>by LAZY_EXPRESSION
-        private get(): <implicit> {
-            ^ D|/nonLocalProperty|.getValue#(Null(null), ::R|/nonLocalProperty|)
-        }
+        private get(): <implicit> { LAZY_BLOCK }
diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
index 368a67e7633..7713ec5b4c4 100644
--- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
@@ -334,6 +334,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
     context: Context<T>,
     isExtension: Boolean,
     lazyDelegateExpression: FirLazyExpression? = null,
+    lazyBodyForGeneratedAccessors: FirLazyBlock? = null,
 ) {
     if (delegateBuilder == null) return
     val delegateFieldSymbol = FirDelegateFieldSymbol(symbol.callableId).also {
@@ -460,8 +461,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
                 isInline = getterStatus?.isInline ?: isInline
             }
             symbol = FirPropertyAccessorSymbol()
-
-            body = FirSingleExpressionBlock(
+            body = lazyBodyForGeneratedAccessors ?: FirSingleExpressionBlock(
                 buildReturnExpression {
                     result = buildFunctionCall {
                         source = fakeSource
@@ -518,7 +518,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
                 }
             }
             valueParameters += parameter
-            body = FirSingleExpressionBlock(
+            body = lazyBodyForGeneratedAccessors ?: FirSingleExpressionBlock(
                 buildReturnExpression {
                     result = buildFunctionCall {
                         source = fakeSource
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.fir.kt b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.fir.kt
index 92cd7eeb35a..78aa7e41c78 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.fir.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.fir.kt
@@ -1,7 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// IGNORE_DIAGNOSTIC_API
-// IGNORE_REVERSED_RESOLVE
-// ^KT-61491
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
index 7128f1df929..555121142e1 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
@@ -1,7 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// IGNORE_DIAGNOSTIC_API
-// IGNORE_REVERSED_RESOLVE
-// ^KT-61491
 
 import kotlin.reflect.KProperty