Miscellaneous accumulated cleanups.