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