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