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