More general cleanups.