Continue BatchLexer improvements
Tokenize punctuation strings as their own tokens