diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
index 3f981a80bde..b68f95b6f91 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cfg
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.cfg.TailRecursionKind.*
-import org.jetbrains.kotlin.cfg.VariableUseState.READ
+import org.jetbrains.kotlin.cfg.VariableUseState.*
 import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
 import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
@@ -606,41 +606,13 @@ class ControlFlowInformationProvider private constructor(
                 report(Errors.UNUSED_VARIABLE.on(element, variableDescriptor), ctxt)
             }
             else if (element is KtParameter) {
-                val owner = element.parent?.parent
-                if (element.isSingleUnderscore) return
-                when (owner) {
-                    is KtPrimaryConstructor -> if (!element.hasValOrVar()) {
-                        val containingClass = owner.getContainingClassOrObject()
-                        val containingClassDescriptor = trace.get(
-                                BindingContext.DECLARATION_TO_DESCRIPTOR, containingClass)
-                        if (!DescriptorUtils.isAnnotationClass(containingClassDescriptor)) {
-                            report(Errors.UNUSED_PARAMETER.on(element, variableDescriptor), ctxt)
-                        }
-                    }
-                    is KtFunction -> {
-                        val mainFunctionDetector = MainFunctionDetector(trace.bindingContext)
-                        val isMain = owner is KtNamedFunction && mainFunctionDetector.isMain(owner)
-                        val functionDescriptor =
-                                trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, owner) as? FunctionDescriptor
-                                ?: throw AssertionError(owner.text)
-                        val functionName = functionDescriptor.name.asString()
-                        if (isMain
-                            || functionDescriptor.isOverridableOrOverrides
-                            || owner.hasModifier(KtTokens.OVERRIDE_KEYWORD)
-                            || "getValue" == functionName
-                            || "setValue" == functionName
-                            || "propertyDelegated" == functionName) {
-                            return
-                        }
-                        report(Errors.UNUSED_PARAMETER.on(element, variableDescriptor), ctxt)
-                    }
-                }
+                processUnusedParameter(ctxt, element, variableDescriptor)
             }
         }
-        else if (variableUseState === org.jetbrains.kotlin.cfg.VariableUseState.ONLY_WRITTEN_NEVER_READ && KtPsiUtil.isRemovableVariableDeclaration(element)) {
+        else if (variableUseState === ONLY_WRITTEN_NEVER_READ && KtPsiUtil.isRemovableVariableDeclaration(element)) {
             report(Errors.ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE.on(element, variableDescriptor), ctxt)
         }
-        else if (variableUseState === org.jetbrains.kotlin.cfg.VariableUseState.WRITTEN_AFTER_READ && element is KtVariableDeclaration) {
+        else if (variableUseState === WRITTEN_AFTER_READ && element is KtVariableDeclaration) {
             when (element) {
                 is KtProperty ->
                     element.initializer?.let {
@@ -652,6 +624,38 @@ class ControlFlowInformationProvider private constructor(
         }
     }
 
+    private fun processUnusedParameter(ctxt: VariableUseContext, element: KtParameter, variableDescriptor: VariableDescriptor) {
+        val owner = element.parent?.parent
+        if (element.isSingleUnderscore) return
+        when (owner) {
+            is KtPrimaryConstructor -> if (!element.hasValOrVar()) {
+                val containingClass = owner.getContainingClassOrObject()
+                val containingClassDescriptor = trace.get(
+                        DECLARATION_TO_DESCRIPTOR, containingClass)
+                if (!DescriptorUtils.isAnnotationClass(containingClassDescriptor)) {
+                    report(UNUSED_PARAMETER.on(element, variableDescriptor), ctxt)
+                }
+            }
+            is KtFunction -> {
+                val mainFunctionDetector = MainFunctionDetector(trace.bindingContext)
+                val isMain = owner is KtNamedFunction && mainFunctionDetector.isMain(owner)
+                val functionDescriptor =
+                        trace.get(DECLARATION_TO_DESCRIPTOR, owner) as? FunctionDescriptor
+                        ?: throw AssertionError(owner.text)
+                val functionName = functionDescriptor.name.asString()
+                if (isMain
+                    || functionDescriptor.isOverridableOrOverrides
+                    || owner.hasModifier(KtTokens.OVERRIDE_KEYWORD)
+                    || "getValue" == functionName
+                    || "setValue" == functionName
+                    || "propertyDelegated" == functionName) {
+                    return
+                }
+                report(UNUSED_PARAMETER.on(element, variableDescriptor), ctxt)
+            }
+        }
+    }
+
     ////////////////////////////////////////////////////////////////////////////////
     //  "Unused expressions" in block