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