Adapt to API changes in Saxon 9.5