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