parser refactorings