diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ConstructorCallHighlighter.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ConstructorCallHighlighter.kt
index f575807761e7..d1c42dddca93 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ConstructorCallHighlighter.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ConstructorCallHighlighter.kt
@@ -6,7 +6,6 @@ import com.intellij.psi.PsiType
 import org.jetbrains.plugins.groovy.GroovyBundle
 import org.jetbrains.plugins.groovy.highlighting.HighlightSink
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyMethodResult
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
 import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.DefaultConstructor
 import org.jetbrains.plugins.groovy.lang.resolve.api.Arguments
 import org.jetbrains.plugins.groovy.lang.resolve.api.ExpressionArgument
@@ -14,8 +13,6 @@ import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyCallReference
 
 abstract class ConstructorCallHighlighter(reference: GroovyCallReference, sink: HighlightSink) : CallReferenceHighlighter(reference, sink) {
 
-  protected abstract val argumentList: GrArgumentList?
-
   override fun getInapplicableMethodMessage(result: GroovyMethodResult, containingType: PsiType, arguments: Arguments): String {
     val method = result.element
     val methodName = method.name
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrConstructorInvocationHighlighter.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrConstructorInvocationHighlighter.kt
index 7fb080afe1b2..0b35781f4939 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrConstructorInvocationHighlighter.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrConstructorInvocationHighlighter.kt
@@ -9,16 +9,13 @@ import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.reque
 import org.jetbrains.plugins.groovy.highlighting.HighlightSink
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyMethodResult
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrConstructorInvocation
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
 
 class GrConstructorInvocationHighlighter(
   private val invocation: GrConstructorInvocation,
   sink: HighlightSink
 ) : ConstructorCallHighlighter(invocation.constructorReference, sink) {
 
-  override val argumentList: GrArgumentList get() = invocation.argumentList
-
-  override val highlightElement: PsiElement get() = argumentList
+  override val highlightElement: PsiElement get() = invocation.argumentList
 
   override fun generateFixes(results: Collection<GroovyMethodResult>): Array<LocalQuickFix> {
     val fixes = super.generateFixes(results)
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrEnumConstantHighlighter.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrEnumConstantHighlighter.kt
index 78ff19cf3c3b..2cc0b253f25f 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrEnumConstantHighlighter.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrEnumConstantHighlighter.kt
@@ -3,7 +3,6 @@ package org.jetbrains.plugins.groovy.codeInspection.type.highlighting
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.plugins.groovy.highlighting.HighlightSink
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEnumConstant
 
 class GrEnumConstantHighlighter(
@@ -11,7 +10,5 @@ class GrEnumConstantHighlighter(
   sink: HighlightSink
 ) : ConstructorCallHighlighter(enumConstant.constructorReference, sink) {
 
-  override val argumentList: GrArgumentList? get() = enumConstant.argumentList
-
-  override val highlightElement: PsiElement get() = argumentList ?: enumConstant.nameIdentifierGroovy
+  override val highlightElement: PsiElement get() = enumConstant.argumentList ?: enumConstant.nameIdentifierGroovy
 }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrNewExpressionHighlighter.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrNewExpressionHighlighter.kt
index 4556fc1a593d..05115a01af5e 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrNewExpressionHighlighter.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrNewExpressionHighlighter.kt
@@ -10,7 +10,6 @@ import org.jetbrains.plugins.groovy.annotator.intentions.QuickfixUtil.intentions
 import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.requests.CreateConstructorFromGroovyUsageRequest
 import org.jetbrains.plugins.groovy.highlighting.HighlightSink
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyMethodResult
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrNewExpression
 import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyCallReference
 
@@ -20,10 +19,8 @@ class GrNewExpressionHighlighter(
   sink: HighlightSink
 ) : ConstructorCallHighlighter(reference, sink) {
 
-  override val argumentList: GrArgumentList? get() = newExpression.argumentList
-
   override val highlightElement: PsiElement
-    get() = requireNotNull(argumentList ?: newExpression.referenceElement) {
+    get() = requireNotNull(newExpression.argumentList ?: newExpression.referenceElement) {
       "reference of new expression should exist if it is a constructor call"
     }
 
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/LiteralConstructorReferenceHighlighter.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/LiteralConstructorReferenceHighlighter.kt
index db57cb38b8f0..67bd56dfea3a 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/LiteralConstructorReferenceHighlighter.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/LiteralConstructorReferenceHighlighter.kt
@@ -6,7 +6,6 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.plugins.groovy.GroovyBundle
 import org.jetbrains.plugins.groovy.highlighting.HighlightSink
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
 import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyConstructorReference
 import org.jetbrains.plugins.groovy.lang.typing.GrCollectionConstructorConverter.Companion.hasCollectionApplicableConstructor
 
@@ -15,7 +14,6 @@ class LiteralConstructorReferenceHighlighter(
   override val highlightElement: PsiElement,
   sink: HighlightSink
 ) : ConstructorCallHighlighter(reference, sink) {
-  override val argumentList: GrArgumentList? = null
 
   override fun shouldHighlightInapplicable(): Boolean {
     val clazz = (reference as GroovyConstructorReference).resolveClass()?.element as? PsiClass