(U-000288A9): Apply new conventions for glyph granularity; unify