diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateExecutableFromKotlinUsageRequest.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateExecutableFromKotlinUsageRequest.kt
index 011fabb93e19..be1c2b4d83fd 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateExecutableFromKotlinUsageRequest.kt
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateExecutableFromKotlinUsageRequest.kt
@@ -18,13 +18,13 @@ internal abstract class CreateExecutableFromKotlinUsageRequest<out T : KtCallEle
 ) : CreateExecutableRequest {
     private val project = call.project
     private val callPointer: SmartPsiElementPointer<T> = call.createSmartPointer()
-    private val expectedParameterInfo: MutableList<ExpectedParameter> = mutableListOf()
+    private val expectedParameterInfo: List<ExpectedParameter> = computeExpectedParams(call)
 
-    init {
-        analyze(call) {
-            call.valueArgumentList?.arguments?.forEachIndexed { index, valueArgument ->
-                expectedParameterInfo.add(valueArgument.getExpectedParameterInfo(index))
-            }
+    private fun computeExpectedParams(call: T): List<ExpectedParameter> {
+        return analyze(call) {
+            call.valueArgumentList?.arguments?.mapIndexed { index, valueArgument ->
+                valueArgument.getExpectedParameterInfo(index)
+            } ?: emptyList()
         }
     }
 
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateKotlinCallableActionTextBuilder.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateKotlinCallableActionTextBuilder.kt
index 582f94e3c0a6..8fb18b80a305 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateKotlinCallableActionTextBuilder.kt
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/CreateKotlinCallableActionTextBuilder.kt
@@ -92,7 +92,8 @@ object CreateKotlinCallableActionTextBuilder {
     // We must use short names of types for create-from-usage quick-fix (or IntentionAction) text.
     private val RENDERER_OPTION_FOR_CREATE_FROM_USAGE_TEXT: KtTypeRenderer = KtTypeRendererForSource.WITH_SHORT_NAMES.with {
         classIdRenderer = object : KtClassTypeQualifierRenderer {
-            context(KtAnalysisSession, KtTypeRenderer) override fun renderClassTypeQualifier(type: KtClassType, printer: PrettyPrinter) {
+            context(KtAnalysisSession, KtTypeRenderer)
+            override fun renderClassTypeQualifier(type: KtClassType, printer: PrettyPrinter) {
                 printer.append(type.qualifiers.joinToString(separator = ".") { it.name.asString() })
             }
         }