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