Misc. clean up

This is a series of small, unrelated changes that I intend to commit, assuming no objections are raised here.