Minor parser refactoring