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