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