Andrew, Thanks for the good idea. I ended up doing it a little bit differently - see my patch to the 2.2 branch and let me know if you see any problems. Cheers, Tridge