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