Use a different token type for hex strings
Merge pull request #3146 from yebblies/hextoken

[trivial] Use a different token type for hex strings