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