I was unable to entirely resist the temptation to copy-edit related entries, but will save most of that for a separate pass.
