Various small cleanup and straightening.