parser: Cleaner fix, comments. Fixes #1174.