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