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