Minor parser refactor