Simplify some control flow and remove a call to TryAnnotateCXXScopeToken

that isn't doing what is desired. It was annotating the current token
not the 'next' token.  This code should be fixed.

llvm-svn: 61656