Miscellaneous minor improvements.

A rather generic commit message, we're afraid, but this one is quite the
melange of minor edits - both individually and altogether. But this is how the
codebase improves, by hook or by crook!