diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
index 438b1e4ca8b..631fed0816f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
@@ -120,6 +120,11 @@ import static org.jetbrains.jet.lexer.JetTokens.*;
         myBuilder.advanceLexer();
     }
 
+    protected void advanceAtSet(final TokenSet set) {
+        assert _atSet(set);
+        myBuilder.advanceLexer();
+    }
+
     protected IElementType tt() {
         return myBuilder.getTokenType();
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index aa32e6dd1f1..26217d9ec9f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -275,7 +275,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
 
         precedence.parseHigherPrecedence(this);
 
-        while (!breakedWithNewLine() && atSet(precedence.getOperations())) {
+        while (!interruptedWithNewLine() && atSet(precedence.getOperations())) {
             IElementType operation = tt();
 
             parseOperationReference();
@@ -331,7 +331,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
         PsiBuilder.Marker expression = mark();
         parseAtomicExpression();
         while (true) {
-            if (breakedWithNewLine()) {
+            if (interruptedWithNewLine()) {
                 break;
             }
             else if (at(LBRACKET)) {
@@ -1708,7 +1708,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
         return myJetParsing.create(builder);
     }
 
-    private boolean breakedWithNewLine() {
+    private boolean interruptedWithNewLine() {
         return !ALLOW_NEWLINE_OPERATIONS.contains(tt()) && myBuilder.newlineBeforeCurrentToken();
     }
 }
diff --git a/grammar/src/when.grm b/grammar/src/when.grm
index d6769712963..4b0dd363a83 100644
--- a/grammar/src/when.grm
+++ b/grammar/src/when.grm
@@ -18,7 +18,6 @@ whenEntry
 
 whenCondition
   : expression
-  : ("." | "?.") postfixUnaryExpression typeArguments? valueArguments?
   : ("in" | "!in") expression
   : ("is" | "!is") isRHS
   ;