Adding comma here means that tokens can no longer contain them. This will break things like:
```
  required int32 brok,en;
```

I don't think this is a major concern, but we can refactor to avoiding changing the tokenizer if necessary.