diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
index 50657defa9c..479160229c7 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
@@ -108,17 +108,17 @@ public abstract class ClassBodyCodegen extends MemberCodegen {
 
     protected void generateDeclaration(PropertyCodegen propertyCodegen, JetDeclaration declaration) {
         if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
-            genFunctionOrProperty(context, (JetTypeParameterListOwner) declaration, v);
+            genFunctionOrProperty((JetTypeParameterListOwner) declaration, v);
         }
         else if (declaration instanceof JetClassOrObject) {
             if (declaration instanceof JetEnumEntry && !enumEntryNeedSubclass(state.getBindingContext(), (JetEnumEntry) declaration)) {
                 return;
             }
 
-            genClassOrObject(context, (JetClassOrObject) declaration);
+            genClassOrObject((JetClassOrObject) declaration);
         }
         else if (declaration instanceof JetClassObject) {
-            genClassOrObject(context, ((JetClassObject) declaration).getObjectDeclaration());
+            genClassOrObject(((JetClassObject) declaration).getObjectDeclaration());
         }
     }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
index 4c92a642621..442751dcfad 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
@@ -52,7 +52,6 @@ public class MemberCodegen extends ParentCodegenAwareImpl {
     }
 
     public void genFunctionOrProperty(
-            @NotNull FieldOwnerContext context,
             @NotNull JetTypeParameterListOwner functionOrProperty,
             @NotNull ClassBuilder classBuilder
     ) {
@@ -127,8 +126,8 @@ public class MemberCodegen extends ParentCodegenAwareImpl {
         }
     }
 
-    public void genClassOrObject(CodegenContext parentContext, JetClassOrObject aClass) {
-        genClassOrObject(parentContext, aClass, state, this);
+    public void genClassOrObject(JetClassOrObject aClass) {
+        genClassOrObject(context, aClass, state, this);
     }
 
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
index 2a09143afcb..31e5bcc27de 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
@@ -288,7 +288,7 @@ public class PackageCodegen extends GenerationStateAware {
 
         new PackagePartCodegen(builder, file, packagePartType, packagePartContext, state).generate();
 
-        final FieldOwnerContext packageFacade = CodegenContext.STATIC.intoPackageFacade(packagePartType, packageFragment);
+        FieldOwnerContext packageFacade = CodegenContext.STATIC.intoPackageFacade(packagePartType, packageFragment);
         
         final MemberCodegen memberCodegen = getMemberCodegen(packageFacade);
 
@@ -303,7 +303,7 @@ public class PackageCodegen extends GenerationStateAware {
                             @Override
                             public void run() {
                                 memberCodegen.genFunctionOrProperty(
-                                        packageFacade, (JetTypeParameterListOwner) declaration, v.getClassBuilder());
+                                        (JetTypeParameterListOwner) declaration, v.getClassBuilder());
                             }
                         }
                 );
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java
index 4f6eddb1bb9..43a4702c3c8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java
@@ -79,7 +79,7 @@ public class PackagePartCodegen extends MemberCodegen {
 
         for (JetDeclaration declaration : jetFile.getDeclarations()) {
             if (declaration instanceof JetNamedFunction || declaration instanceof JetProperty) {
-                genFunctionOrProperty(context, (JetTypeParameterListOwner) declaration, v);
+                genFunctionOrProperty((JetTypeParameterListOwner) declaration, v);
             }
         }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
index 319a52ef1d2..266ef47dfe3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
@@ -204,7 +204,7 @@ public class ScriptCodegen extends MemberCodegen {
 
     private void genMembers(@NotNull FieldOwnerContext context, @NotNull ClassBuilder classBuilder) {
         for (JetDeclaration decl : scriptDeclaration.getDeclarations()) {
-            genFunctionOrProperty(context, (JetTypeParameterListOwner) decl, classBuilder);
+            genFunctionOrProperty((JetTypeParameterListOwner) decl, classBuilder);
         }
     }