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