Assorted additional cleanups.