Switched order of post-parse logic in grammar + regen code (#50)