Some small cleanups.