Some changes for future migration to Saxon 9.6.0-1