Merge pull request #104 from colincross/parser

More parser cleanups