I've had some feedback from Robert Watson which has been factored into the branch. Thanks, Robert! If I hear no objections I'll aim to commit this code to -CURRENT within the next week, subject to approval. No MFC is planned because of the magnitude of the change. Regards, BMS