Fix regression from r26893: a few messages that formerly accepted character entities...