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