This patch slightly extends the heuristics used when trying to skip mapping of missing glyphs. Fixes 5677.