a few more minor parser updates