(M-03066): Apply new conventions for glyph granularity; unify