Assorted cleanups.