Well, I've been through the sources with a (fairly) fine-tooth comb. I think I covered all the points Ryan mentioned, so I hope it meets approval now. Revised patch attached to the ticket. Cheers, -- Pete --