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