Move some logic into parser factory.
Merge pull request #222 from csmith/master

Move some logic into parser factory.