Regen'd grammar with greg 0.4.4