More tiny cleanups.