I *think* that's working. My peg grammar is, er, no longer current...