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