diff --git a/java/java-tests/testData/psi/parser-partial/declarations/AnnoDefault.txt b/java/java-tests/testData/psi/parser-partial/declarations/AnnoDefault.txt
index 5d8e43524fb3..7ce071b2355e 100644
--- a/java/java-tests/testData/psi/parser-partial/declarations/AnnoDefault.txt
+++ b/java/java-tests/testData/psi/parser-partial/declarations/AnnoDefault.txt
@@ -13,7 +13,6 @@ PsiJavaFile:AnnoDefault.java
           <empty list>
     PsiWhiteSpace(' ')
     PsiIdentifier:foo('foo')
-    PsiWhiteSpace(' ')
     PsiParameterList:()
       PsiJavaToken:LPARENTH('(')
       PsiJavaToken:RPARENTH(')')
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
index d29a9d8eee12..624aea51f565 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
@@ -60,7 +60,7 @@ public class DeclarationParserTest extends JavaParsingTestCase {
   public void testEnumWithoutConstants() { doParserTest("{ private A }", false, true); }
 
   public void testAnnoSimple() { doParserTest("{ int foo (); }", true, false); }
-  public void testAnnoDefault() { doParserTest("{ Class foo () default String.class; }", true, false); }
+  public void testAnnoDefault() { doParserTest("{ Class foo() default String.class; }", true, false); }
   public void testAnnoNested() { doParserTest("{ @interface Inner { String bar () default \"<unspecified>\"; } }", true, false); }
   public void testAnnoInner() { doParserTest("{ @interface Inner { double bar () default 0.0; } }"); }
   public void testAnnoOtherMembers() { doParserTest("{ int field;\n void m() {}\n class C {}\n interface I {} }", true, false); }
diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index 885720f0251f..da2212ccd5e0 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.lang.impl;
 
 import com.intellij.lang.*;
@@ -66,6 +65,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
   public static final Key<TripleFunction<ASTNode, LighterASTNode, FlyweightCapableTreeStructure<LighterASTNode>, ThreeState>>
     CUSTOM_COMPARATOR = Key.create("CUSTOM_COMPARATOR");
 
+  private static TokenSet ourAnyLanguageWhitespaceTokens = TokenSet.EMPTY;
+
   private final Project myProject;
   private PsiFile myFile;
 
@@ -75,7 +76,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
   private final MyList myProduction = new MyList();
 
-  @NotNull private final Lexer myLexer;
+  private final Lexer myLexer;
   private final TokenSet myWhitespaces;
   private TokenSet myComments;
 
@@ -92,8 +93,6 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
   private final MyTreeStructure myParentLightTree;
   private final int myOffset;
 
-  private static TokenSet ourAnyLanguageWhitespaceTokens = TokenSet.EMPTY;
-
   private Map<Key, Object> myUserData = null;
   private IElementType myCachedTokenType;