More tweaks to parsers. [minor]