Tweak grammar for consistency