Minor cleanups

A bunch of small things that I tripped over and fixed up while I was there.