diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
index b90abf5050c..fc234f8e990 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
@@ -59,6 +59,7 @@ public object ShortenReferences {
 
         private fun bindingContext(expression: JetReferenceExpression): BindingContext = resolveMap[expression]!!
 
+        [suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")]
         override fun visitUserType(userType: JetUserType) {
             userType.getTypeArgumentList()?.accept(this)
 
@@ -222,7 +223,7 @@ public object ShortenReferences {
             if (target != null) return target.asString()
 
             val targets = bindingContext.get(BindingContext.AMBIGUOUS_REFERENCE_TARGET, referenceExpression)
-            if (targets != null) return HashSet(targets.map{it!!.asString()})
+            if (targets != null) return HashSet(targets.map{it.asString()})
 
             return null
         }