Some initial stuff to get it working with Saxon 9.5