Rewriting parser to be more concise.