Small refactor in Parser.