Use XPath for execution munging too.