Fix handling of multiply-encoded glyphs.