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