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