(U-0002232C): Apply new conventions for glyph granularity; unify