Two small cleanups.