diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ReplaceGetOrSetInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ReplaceGetOrSetInspection.kt
index 38332ae5901c..2da82d5f3607 100644
--- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ReplaceGetOrSetInspection.kt
+++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ReplaceGetOrSetInspection.kt
@@ -5,7 +5,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.calls.KtSimpleFunctionCall
-import org.jetbrains.kotlin.analysis.api.calls.KtSuccessCallInfo
+import org.jetbrains.kotlin.analysis.api.calls.successfulCallOrNull
 import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol
@@ -42,8 +42,8 @@ internal class ReplaceGetOrSetInspection :
     context(KtAnalysisSession)
     override fun prepareContext(element: KtDotQualifiedExpression): Context? {
         // `resolveCall()` is needed to filter out `set` functions with varargs or default values. See the `setWithVararg.kt` test.
-        val call = (element.resolveCall() as? KtSuccessCallInfo)?.call as? KtSimpleFunctionCall ?: return null
-        val functionSymbol = call.partiallyAppliedSymbol.symbol
+        val call = element.resolveCall()?.successfulCallOrNull<KtSimpleFunctionCall>() ?: return null
+        val functionSymbol = call.symbol
         if (functionSymbol !is KtFunctionSymbol || !functionSymbol.isOperator) {
             return null
         }
diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/RedundantModalityModifierInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/RedundantModalityModifierInspection.kt
index c7ec2a448e38..747b8bdaa3ae 100644
--- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/RedundantModalityModifierInspection.kt
+++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/RedundantModalityModifierInspection.kt
@@ -24,10 +24,8 @@ class RedundantModalityModifierInspection :
     override fun prepareContextByDiagnostic(
         element: KtModifierListOwner,
         diagnostic: KtFirDiagnostic.RedundantModalityModifier
-    ): ModifierContext? {
-        return when(element) {
-            is KtDeclaration -> element.modalityModifierType()?.let { ModifierContext(it) }
-            else -> null
-        }
+    ): ModifierContext? = when(element) {
+        is KtDeclaration -> element.modalityModifierType()?.let { ModifierContext(it) }
+        else -> null
     }
 }
\ No newline at end of file