Various housekeeping cleanups.