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