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