diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt
index 9a9751267f7..675dff520c6 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt
@@ -45,7 +45,7 @@ class KotlinUBinaryExpression(
     override val operatorIdentifier: UIdentifier?
         get() = KotlinUIdentifier(psi.operationReference.getReferencedNameElement(), this)
 
-    override fun resolveOperator() = psi.operationReference.resolveCallToDeclaration(context = this) as? PsiMethod
+    override fun resolveOperator() = psi.operationReference.resolveCallToDeclaration() as? PsiMethod
 
     override val operator = when (psi.operationToken) {
         KtTokens.EQ -> UastBinaryOperator.ASSIGN
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt
index c0c89a33c91..6dedf972075 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt
@@ -48,7 +48,7 @@ class KotlinUCallableReferenceExpression(
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
 
-    override fun resolve() = psi.callableReference.resolveCallToDeclaration(this)
+    override fun resolve() = psi.callableReference.resolveCallToDeclaration()
 
     override fun multiResolve(): Iterable<ResolveResult> = getResolveResultVariants(psi.callableReference)
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.182 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.182
index cffab1d1133..568e109c7ba 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.182
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.182
@@ -45,5 +45,5 @@ class KotlinUCallableReferenceExpression(
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
 
-    override fun resolve() = psi.callableReference.resolveCallToDeclaration(this)
+    override fun resolve() = psi.callableReference.resolveCallToDeclaration()
 }
\ No newline at end of file
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.191 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.191
index 83011877fbe..2f2b06ce476 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.191
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt.191
@@ -45,7 +45,7 @@ class KotlinUCallableReferenceExpression(
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
 
-    override fun resolve() = psi.callableReference.resolveCallToDeclaration(this)
+    override fun resolve() = psi.callableReference.resolveCallToDeclaration()
 
     override fun multiResolve(): Iterable<ResolveResult> = getResolveResultVariants(psi.callableReference)
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt
index 69be1b1d232..3a0b23a12bb 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt
@@ -60,7 +60,7 @@ class KotlinUObjectLiteralExpression(
         psi.typeArguments.map { it.typeReference.toPsiType(this, boxed = true) }
     }
 
-    override fun resolve() = superClassConstructorCall?.resolveCallToDeclaration(this) as? PsiMethod
+    override fun resolve() = superClassConstructorCall?.resolveCallToDeclaration() as? PsiMethod
 
     override fun getArgumentForParameter(i: Int): UExpression? =
         superClassConstructorCall?.let { it.getResolvedCall(it.analyze()) }?.let { getArgumentExpressionByIndex(i, it, this) }
@@ -73,7 +73,7 @@ class KotlinUObjectLiteralExpression(
         override val javaPsi = null
         override val sourcePsi = psi
 
-        override fun resolve() = (psi.resolveCallToDeclaration(this) as? PsiMethod)?.containingClass
+        override fun resolve() = (psi.resolveCallToDeclaration() as? PsiMethod)?.containingClass
 
         override val annotations: List<UAnnotation>
             get() = emptyList()
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt
index daf5bffeb97..ec9f5e602a3 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt
@@ -40,7 +40,7 @@ class KotlinUPostfixExpression(
     override val operatorIdentifier: UIdentifier?
         get() = KotlinUIdentifier(psi.operationReference, this)
 
-    override fun resolveOperator() = psi.operationReference.resolveCallToDeclaration(context = this) as? PsiMethod
+    override fun resolveOperator() = psi.operationReference.resolveCallToDeclaration() as? PsiMethod
 
     override fun resolve(): PsiMethod? = when (psi.operationToken) {
         KtTokens.EXCLEXCL -> operand.tryResolve() as? PsiMethod
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt
index 63c9af6d50b..c0d3bb2e79d 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt
@@ -34,7 +34,7 @@ class KotlinUPrefixExpression(
     override val operatorIdentifier: UIdentifier?
         get() = KotlinUIdentifier(psi.operationReference, this)
 
-    override fun resolveOperator() = psi.operationReference.resolveCallToDeclaration(context = this) as? PsiMethod
+    override fun resolveOperator() = psi.operationReference.resolveCallToDeclaration() as? PsiMethod
 
     override val operator = when (psi.operationToken) {
         KtTokens.EXCL -> UastPrefixOperator.LOGICAL_NOT
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt
index cbfa87d2e00..eb90d47c3ec 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt
@@ -31,8 +31,8 @@ class KotlinUQualifiedReferenceExpression(
     override val receiver by lz { KotlinConverter.convertOrEmpty(psi.receiverExpression, this) }
     override val selector by lz { KotlinConverter.convertOrEmpty(psi.selectorExpression, this) }
     override val accessType = UastQualifiedExpressionAccessType.SIMPLE
-    
-    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration(this)
+
+    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration()
 
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt.191 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt.191
index 7deb38a1e68..5c060f991c8 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt.191
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt.191
@@ -32,8 +32,8 @@ class KotlinUQualifiedReferenceExpression(
     override val receiver by lz { KotlinConverter.convertOrEmpty(psi.receiverExpression, this) }
     override val selector by lz { KotlinConverter.convertOrEmpty(psi.selectorExpression, this) }
     override val accessType = UastQualifiedExpressionAccessType.SIMPLE
-    
-    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration(this)
+
+    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration()
 
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt
index d9e6401b70e..26198055511 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt
@@ -35,7 +35,7 @@ class KotlinUSafeQualifiedExpression(
 
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
-    
-    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration(this)
+
+    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration()
     override fun multiResolve(): Iterable<ResolveResult> = getResolveResultVariants(psi.selectorExpression)
 }
\ No newline at end of file
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt.182 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt.182
index 1dc882c71fc..dbbf27fb1cc 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt.182
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt.182
@@ -32,6 +32,6 @@ class KotlinUSafeQualifiedExpression(
 
     override val resolvedName: String?
         get() = (resolve() as? PsiNamedElement)?.name
-    
-    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration(this)
+
+    override fun resolve() = psi.selectorExpression?.resolveCallToDeclaration()
 }
\ No newline at end of file
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
index ad65264834a..bcdfcb5a982 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
@@ -43,7 +43,7 @@ open class KotlinUSimpleReferenceExpression(
     givenParent: UElement?
 ) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression, KotlinUElementWithType, KotlinEvaluatableUElement {
     private val resolvedDeclaration: PsiElement? by lz {
-        psi.resolveCallToDeclaration(this)?.let { return@lz it }
+        psi.resolveCallToDeclaration()?.let { return@lz it }
 
         val declarationDescriptor = psi.analyze()[BindingContext.REFERENCE_TARGET, psi] ?: return@lz null
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191
index b8ae2493eb5..d621cfd0aa5 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191
@@ -43,7 +43,7 @@ open class KotlinUSimpleReferenceExpression(
     givenParent: UElement?
 ) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression, KotlinUElementWithType, KotlinEvaluatableUElement {
     private val resolvedDeclaration: PsiElement? by lz {
-        psi.resolveCallToDeclaration(this)?.let { return@lz it }
+        psi.resolveCallToDeclaration()?.let { return@lz it }
 
         val declarationDescriptor = psi.analyze()[BindingContext.REFERENCE_TARGET, psi] ?: return@lz null
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
index 7a317c3a10c..b6a19d63bd9 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
@@ -280,10 +280,7 @@ internal fun PsiElement.getMaybeLightElement(): PsiElement? {
     }
 }
 
-internal fun KtElement.resolveCallToDeclaration(
-    context: KotlinAbstractUElement,
-    resultingDescriptor: DeclarationDescriptor? = null
-): PsiElement? {
+internal fun KtElement.resolveCallToDeclaration(resultingDescriptor: DeclarationDescriptor? = null): PsiElement? {
     val descriptor = resultingDescriptor ?: run {
         val resolvedCall = getResolvedCall(analyze()) ?: return null
         resolvedCall.resultingDescriptor