Some more cleanups.