XPath dsl tweaks