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