Fixups for 9.2

See commit log for details on changes.
potato, potahto.  Either is OK, but the "the" is probably a more precise form.  I'll fix it.