The attached patch removes "convert ... using ..." as recently discussed on -hackers. Most of the patch is regression test changes.
If there's no objection I'll apply it in a day or two.
cheers
andrew