Minor cleansups.