Little bit of cleanup on the parser.
Minor cleanups here too.