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