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