Some small cosmetic cleanups.