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