Squashing together some rather important cosmetic changes.