More wonderful half-finished changes.