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