More cosmetic cleanups.