move to using the new common evaluateXPath()