Java to Kotlin converter: minor code refactoring

j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt

@@ -101,7 +101,14 @@ class ConstructorConverter(private val converter: Converter) {
                 }
             }
 
-            val bodyConverter = converter.withExpressionVisitor { ExpressionVisitor(it, usageReplacementMap) }
+            val bodyConverter = converter.withExpressionVisitor {
+                object : ExpressionVisitor(it, usageReplacementMap) {
+                    override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
+                        if (expression.isSuperConstructorCall()) return // skip it
+                        super.visitMethodCallExpression(expression)
+                    }
+                }
+            }
             postProcessBody(bodyConverter.convertBlock(body, false, { !statementsToRemove.contains(it) }))
         }
         else {

j2k/src/org/jetbrains/jet/j2k/ConstructorUtils.kt

@@ -59,9 +59,6 @@ fun PsiClass.getPrimaryConstructor(): PsiMethod? {
     }
 }
 
-fun PsiElement.isInsidePrimaryConstructor(): Boolean
-        = getContainingConstructor()?.isPrimaryConstructor() ?: false
-
 fun PsiElement.getContainingMethod(): PsiMethod? {
     var context = getContext()
     while (context != null) {

j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt

@@ -163,8 +163,6 @@ open class ExpressionVisitor(private val converter: Converter,
     }
 
     override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
-        if (expression.isSuperConstructorCall() && expression.isInsidePrimaryConstructor()) return // skip it
-
         val methodExpr = expression.getMethodExpression()
         val arguments = expression.getArgumentList().getExpressions()
         val target = methodExpr.resolve()