Minor XPath selection improvements.