(U-00020675): Apply new conventions for glyph granularity.