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