Tweak error reporting in new parser to use fewer lines