Yet more cleanups.