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