diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index bbb91c040..7cf6d891d 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -601,7 +601,7 @@ class Parser
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
             if ( ! isset($qComp['resultVariable'])) {
                 $this->semanticalError(
-                    "'$identVariable' does not point to a ResultVariable.", $deferredItem['token']
+                    "'$resultVariable' does not point to a ResultVariable.", $deferredItem['token']
                 );
             }
 
@@ -652,8 +652,8 @@ class Parser
                 $assoc = $class->associationMappings[$field];
 
                 $fieldType = ($assoc['type'] & ClassMetadata::TO_ONE)
-                	? AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION
-                	: AST\PathExpression::TYPE_COLLECTION_VALUED_ASSOCIATION;
+                    ? AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION
+                    : AST\PathExpression::TYPE_COLLECTION_VALUED_ASSOCIATION;
             }
 
             // Validate if PathExpression is one of the expected types
@@ -700,7 +700,7 @@ class Parser
 
         $foundRootEntity = false;
 
-        foreach ($this->_identVariableExpressions AS $dqlAlias => $expr) {
+        foreach ($this->_identVariableExpressions as $dqlAlias => $expr) {
             if (isset($this->_queryComponents[$dqlAlias]) && $this->_queryComponents[$dqlAlias]['parent'] === null) {
                 $foundRootEntity = true;
             }
@@ -905,7 +905,6 @@ class Parser
      */
     public function JoinAssociationPathExpression()
     {
-        $token         = $this->_lexer->lookahead;
         $identVariable = $this->IdentificationVariable();
 
         if ( ! isset($this->_queryComponents[$identVariable])) {
@@ -941,7 +940,6 @@ class Parser
      */
     public function PathExpression($expectedTypes)
     {
-        $token = $this->_lexer->lookahead;
         $identVariable = $this->IdentificationVariable();
         $field = null;
 
@@ -1451,7 +1449,7 @@ class Parser
      */
     public function SubselectIdentificationVariableDeclaration()
     {
-        $glimpse = $this->_lexer->glimpse();
+        $this->_lexer->glimpse();
 
         /* NOT YET IMPLEMENTED!
 
@@ -2743,7 +2741,7 @@ class Parser
      */
     public function ComparisonExpression()
     {
-        $peek = $this->_lexer->glimpse();
+        $this->_lexer->glimpse();
 
         $leftExpr  = $this->ArithmeticExpression();
         $operator  = $this->ComparisonOperator();