* A few more cleanups.