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