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