Trivial cleanups.