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