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