For better or for worse, it's uploaded now. I ran out of time to split the patch in two as I'd said I would. So it's the same patches Tonio applied, just freshened for the new upstream version. Scott K