diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 9eac2586d1c..2f7d11653f7 100644
--- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -896,11 +896,11 @@ public class ExpressionCodegen extends JetVisitor {
         return funDescriptor;
     }
 
-    private void invokeMethodWithArguments(CallableMethod callableMethod, JetCallExpression expression) {
+    public void invokeMethodWithArguments(CallableMethod callableMethod, JetCall expression) {
         invokeMethodWithArguments(callableMethod, expression, false);
     }
 
-    private void invokeMethodWithArguments(CallableMethod callableMethod, JetCallExpression expression, final boolean haveReceiver) {
+    private void invokeMethodWithArguments(CallableMethod callableMethod, JetCall expression, final boolean haveReceiver) {
         if (callableMethod.isOwnerFromCall()) {
             setOwnerFromCall(callableMethod, expression);
         }
@@ -914,7 +914,7 @@ public class ExpressionCodegen extends JetVisitor {
         callableMethod.invoke(v);
     }
 
-    private void setOwnerFromCall(CallableMethod callableMethod, JetCallExpression expression) {
+    private void setOwnerFromCall(CallableMethod callableMethod, JetCall expression) {
         if (expression.getParent() instanceof JetQualifiedExpression) {
             final JetExpression receiver = ((JetQualifiedExpression) expression.getParent()).getReceiverExpression();
             JetType expressionType = bindingContext.getExpressionType(receiver);
@@ -926,7 +926,7 @@ public class ExpressionCodegen extends JetVisitor {
         }
     }
 
-    private JetExpression getReceiverForSelector(JetElement expression) {
+    private static JetExpression getReceiverForSelector(PsiElement expression) {
         if (expression.getParent() instanceof JetDotQualifiedExpression && !isReceiver(expression)) {
             final JetDotQualifiedExpression parent = (JetDotQualifiedExpression) expression.getParent();
             return parent.getReceiverExpression();
@@ -934,7 +934,7 @@ public class ExpressionCodegen extends JetVisitor {
         return null;
     }
 
-    private void ensureReceiverOnStack(JetElement expression, @Nullable ClassDescriptor calleeContainingClass) {
+    private void ensureReceiverOnStack(PsiElement expression, @Nullable ClassDescriptor calleeContainingClass) {
         JetExpression receiver = getReceiverForSelector(expression);
         if (receiver != null) {
             if (!resolvesToClassOrPackage(receiver)) {
@@ -1013,7 +1013,7 @@ public class ExpressionCodegen extends JetVisitor {
         }
     }
 
-    private static boolean isReceiver(JetElement expression) {
+    private static boolean isReceiver(PsiElement expression) {
         final PsiElement parent = expression.getParent();
         if (parent instanceof JetQualifiedExpression) {
             final JetExpression receiverExpression = ((JetQualifiedExpression) parent).getReceiverExpression();
diff --git a/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index c87f0aff109..ffd7e5f1529 100644
--- a/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -330,13 +330,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         }
 
         CallableMethod method = state.getTypeMapper().mapToCallableMethod(constructorDescriptor, kind);
-        List<JetArgument> args = constructorCall.getValueArguments();
-        for (int i = 0, argsSize = args.size(); i < argsSize; i++) {
-            JetArgument arg = args.get(i);
-            codegen.gen(arg.getArgumentExpression(), method.getValueParameterTypes().get(i));
-        }
-
-        method.invoke(iv);
+        codegen.invokeMethodWithArguments(method, constructorCall);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetCall.java
index 66169083301..937ef578915 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetCall.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetCall.java
@@ -1,5 +1,6 @@
 package org.jetbrains.jet.lang.psi;
 
+import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -8,7 +9,7 @@ import java.util.List;
 /**
  * @author abreslav
  */
-public interface JetCall {
+public interface JetCall extends PsiElement {
     @Nullable
     JetArgumentList getValueArgumentList();