diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index c5ed745..8770bc2 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -479,11 +479,8 @@
     // Turn a potentially qualified name into a annot_qualtypename or
     // annot_cxxscope if it would be valid.  This handles things like x::y, etc.
     if (getLang().CPlusPlus) {
-      TryAnnotateTypeOrScopeToken();
-    
-      // If TryAnnotateTypeOrScopeToken modified the current token, then tail
-      // recurse.
-      if (Tok.getKind() != tok::identifier)
+      // If TryAnnotateTypeOrScopeToken annotates the token, tail recurse.
+      if (TryAnnotateTypeOrScopeToken())
         return ParseCastExpression(isUnaryExpression);
     }