Several cleanups.