Add support for complex "byXpath" expressions.