merge #16371: fix up the English a bit more.