Improve comment tokenization