Updated to Saxon 9.5.x APIs