more minor parser refactorings