Refactor Parser a bit.