Clean up some of the new cleanups.