Small cosmetic cleanups.