XPATH: Minor package refactoring.