BUG: correctly tokenize local variable references
Merge pull request #6430 from cpcloud/eval-fix-at-containing-strings

BUG: correctly tokenize local variable references