More XPath; less kludges