Rule grammar tweaks