(U-0002456B): Apply new conventions for glyph granularity; unify