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