Some minor housekeeping.