Tokenizer: fix minor warnings.

[SVN r83981]
Tokenizer: Remove obsolete MSVC version check.

[SVN r86037]
Merge Steven Kelley's changes to master