Remove more uses of charsetDTD