(U-000211D2): Apply new conventions for glyph granularity; unify