Refactor to use SimpleGrammar 0.0.3; peek in parser rules