Rewrite parsing. Make it a little simpler. Seems to work well.