Make plural msgid handling more robust against encoding