Various small cleanups.