Fix more grammar ambiguities.