Minor tweaks to parsing