Fix tokenization regexes to not contain sub-parsing groups