MFC r320146, r320170, 320842:
Minor grammar changes and cleanups in order to facilitate future merges.