Slightly modify the parser code.

I would not even call that "refactoring."