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