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