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