More parser refactoring