Assorted cleanups

A selection of trivial cleanups that I noticed while reading.