Further editorial cleanup
This series of editorial/non-substantive cleanup incorporates @twisstle's editorial changes from !261 (merged), @fstrenzke's text from !265 (closed), and the uncontroverisal parts of Jonathan Hammell's review on the mailing list.