(U-00022678): Apply new conventions for glyph granularity.