Pull grammar tweaks into fork