diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
index 1e7cb557896..6fad048e6d3 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
@@ -44,6 +44,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ExternalSignatureResolver
 import org.jetbrains.jet.utils.*
 import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
+import org.jetbrains.jet.lang.resolve.scopes.JetScope.DescriptorKindExclude.NonExtensions
 
 public abstract class LazyJavaMemberScope(
         protected val c: LazyJavaResolverContextWithTypes,
@@ -309,7 +310,7 @@ public abstract class LazyJavaMemberScope(
             }
         }
 
-        if (kindFilter.acceptsKind(JetScope.FUNCTION) && !kindFilter.excludes.contains(JetScope.DescriptorKindExclude.NonExtensions)) {
+        if (kindFilter.acceptsKind(JetScope.FUNCTION) && !kindFilter.excludes.contains(NonExtensions)) {
             for (name in getFunctionNames(kindFilter, nameFilter)) {
                 if (nameFilter(name)) {
                     result.addAll(getFunctions(name))
@@ -317,7 +318,7 @@ public abstract class LazyJavaMemberScope(
             }
         }
 
-        if (kindFilter.acceptsKind(JetScope.VARIABLE) && !kindFilter.excludes.contains(JetScope.DescriptorKindExclude.NonExtensions)) {
+        if (kindFilter.acceptsKind(JetScope.VARIABLE) && !kindFilter.excludes.contains(NonExtensions)) {
             for (name in getAllPropertyNames()) {
                 if (nameFilter(name)) {
                     result.addAll(getProperties(name))
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt
index 3d8fc18106f..a94f018543a 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt
@@ -91,7 +91,7 @@ public trait JetScope {
         }
     }
 
-    public data class KindFilter(
+    public class KindFilter(
             public val kindMask: Int,
             public val excludes: List<DescriptorKindExclude> = listOf()
     ) {
@@ -113,9 +113,6 @@ public trait JetScope {
             return KindFilter(mask, excludes)
         }
 
-        public val isEmpty: Boolean
-            get() = kindMask == 0
-
         class object {
             public val ALL: KindFilter = KindFilter(ALL_KINDS_MASK)
             public val CALLABLES: KindFilter = KindFilter(FUNCTION or VARIABLE)
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
index 9f35df844d4..2f58d16f2ac 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
@@ -101,9 +101,8 @@ public object TipsManager{
             val receiverValues = receivers.map { it.getValue() }
 
             resolutionScope.getDescriptorsFiltered(kindFilter, nameFilter).filterTo(descriptorsSet) {
-                if (it is CallableDescriptor && it.getExtensionReceiverParameter() != null) {
+                if (it is CallableDescriptor && it.getExtensionReceiverParameter() != null)
                     it.isExtensionCallable(receiverValues, context, dataFlowInfo, false)
-                }
                 else
                     true
             }