Updated the PEG for clearer parse trees.