Found two more spots to replace hard-coded XPath selectors with calls to
getXPathSelector()