More various cleanups.