diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
index 94b070c2efe..9203a72fd85 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
@@ -479,3 +479,15 @@ private fun findFirstLeafWhollyInRange(file: PsiFile, range: TextRange): PsiElem
     assert(elementRange.getStartOffset() >= range.getStartOffset())
     return if (elementRange.getEndOffset() <= range.getEndOffset()) element else null
 }
+
+fun JetNamedDeclaration.getValueParameters(): List<JetParameter> {
+    return getValueParameterList()?.getParameters() ?: Collections.emptyList()
+}
+
+fun JetNamedDeclaration.getValueParameterList(): JetParameterList? {
+    return when (this) {
+        is JetCallableDeclaration -> getValueParameterList()
+        is JetClass -> getPrimaryConstructorParameterList()
+        else -> null
+    }
+}
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index f9a68d0746c..4b709e4f933 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -53,6 +53,7 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getValueParameters
 import org.jetbrains.kotlin.psi.psiUtil.isAncestor
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.psi.psiUtil.siblings
@@ -1072,15 +1073,6 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
     }
 }
 
-private fun JetNamedDeclaration.getValueParameters(): List<JetParameter> {
-    return when (this) {
-               is JetCallableDeclaration -> getValueParameterList()
-               is JetClass -> getPrimaryConstructorParameterList()
-               is JetObjectDeclaration -> null
-               else -> throw AssertionError("Unexpected declaration kind: ${getText()}")
-           }?.getParameters() ?: Collections.emptyList()
-}
-
 private fun JetNamedDeclaration.getReturnTypeReference(): JetTypeReference? {
     return when (this) {
         is JetCallableDeclaration -> getTypeReference()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
index 05f999bf852..fa1b9b464e0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.idea.core.refactoring.CollectingValidator
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.getValueParameters
 import java.util.Collections
 import java.util.HashSet
 import java.util.LinkedHashSet