Hi Andrew, >> Would you mind doing some tidying of this code ? > > How about the attached? > > I've formed it as a separate patch to be applied on top of my previous > patch. Hopefully this isn't a problem. Great! Both patches are approved. Thanks very much for doing this. Cheers Nick