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