Some random cleanups.