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