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