OCL to XPath completely refactored