(U-000250E9): Apply new conventions for glyph granularity; unify