Now with even less XPath and more robustness