Way, way too much tidying in one go.