Various changes coming about from spec-half-day.