(U-00023AA0): Apply new conventions for glyph granularity; add