diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 007477480..f27ce730d 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -957,11 +957,10 @@ class Doctrine_ORM_Query_Parser
     }
 
     /**
-     * SimpleConditionalExpression ::= ExistsExpression |
-     *          (SimpleStateFieldPathExpression (ComparisonExpression | BetweenExpression | LikeExpression |
-     *           InExpression | NullComparisonExpression)) |
-     *          (CollectionValuedPathExpression EmptyCollectionComparisonExpression) |
-     *          (EntityExpression CollectionMemberExpression)
+     * SimpleConditionalExpression ::=
+     *      ComparisonExpression | BetweenExpression | LikeExpression |
+     *      InExpression | NullComparisonExpression | ExistsExpression |
+     *      EmptyCollectionComparisonExpression | CollectionMemberExpression
      */
     private function _SimpleConditionalExpression()
     {
diff --git a/query-language.txt b/query-language.txt
index 97d7fd079..0056cdce0 100644
--- a/query-language.txt
+++ b/query-language.txt
@@ -200,7 +200,7 @@ NamedParameter      ::= ":" string
  */
 ArithmeticExpression       ::= SimpleArithmeticExpression | "(" Subselect ")"
 SimpleArithmeticExpression ::= ArithmeticTerm {("+" | "-") ArithmeticTerm}*
-ArithmeticTerm             ::= ArithmeticFactor {("*" |"/") ArithmeticFactor}*
+ArithmeticTerm             ::= ArithmeticFactor {("*" | "/") ArithmeticFactor}*
 ArithmeticFactor           ::= [("+" | "-")] ArithmeticPrimary
 ArithmeticPrimary          ::= StateFieldPathExpression | Literal | "(" SimpleArithmeticExpression ")" | Function | AggregateExpression