Misc cleanups and minor improvements.