Support for event.raw and more XPath datamodel refactorings