(U-00021BC4): Apply new conventions for glyph granularity; unify