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