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