Even more cleanups.