Refactor to use SimpleGrammar 0.0.2