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