Tiny cleanup.
More small cleanups.