minor parser tweaks