Various attempts to rationalise data management, not yet complete.