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