Fix some minor infelicities.  Some of these things were introduced in
commit fe263d11, and some are older.