diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 0ac045a7afa..4f10ab8aedc 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -2245,7 +2245,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
     }
 
     public StackValue generateThisOrOuter(@NotNull ClassDescriptor calleeContainingClass, boolean isSuper) {
-        boolean isSingleton = CodegenBinding.isSingleton(bindingContext, calleeContainingClass);
+        boolean isSingleton = calleeContainingClass.getKind().isSingleton();
         if (isSingleton) {
             if (context.hasThisDescriptor() && context.getThisDescriptor().equals(calleeContainingClass)) {
                 return StackValue.local(0, typeMapper.mapType(calleeContainingClass));
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
index f1ecf4fcc68..e00f365202a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
@@ -150,8 +150,8 @@ public class CodegenBinding {
         bindingTrace.record(CLASS_FOR_SCRIPT, scriptDescriptor, classDescriptor);
     }
 
-    public static boolean canHaveOuter(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
-        if (isSingleton(bindingContext, classDescriptor)) {
+    public static boolean canHaveOuter(@NotNull BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
+        if (classDescriptor.getKind() != ClassKind.CLASS) {
             return false;
         }
 
@@ -160,28 +160,7 @@ public class CodegenBinding {
             return false;
         }
 
-        ClassKind kind = classDescriptor.getKind();
-        if (kind == ClassKind.CLASS) {
-            return classDescriptor.isInner() || !(classDescriptor.getContainingDeclaration() instanceof ClassDescriptor);
-        }
-        else if (kind == ClassKind.OBJECT) {
-            return !isSingleton(bindingContext, enclosing);
-        }
-        else {
-            return false;
-        }
-    }
-
-    public static boolean isSingleton(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
-        if (isObjectDeclaration(bindingContext, classDescriptor)) {
-            return true;
-        }
-
-        if (classDescriptor.getKind() == ClassKind.ENUM_ENTRY) {
-            return true;
-        }
-
-        return false;
+        return classDescriptor.isInner() || !(classDescriptor.getContainingDeclaration() instanceof ClassDescriptor);
     }
 
     static void recordClosure(