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