Search & replace war on old wf* xml functions