(U-00021D3C): Apply new conventions for glyph granularity; add