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