A few small cleanups.