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