Refs #20 More cleanup in Parser