> Fine. I'll work on that basis. I'll prepare a full-blown patch which can
> be applied Monday -unless anyone else is sitting on uncommitted changes
> to the directory that they want me to wait for?
Nothing important. Shall I suggest that you do the rearrangement first, and
then once everything's happy, we can work on removing redundant code?
Chris