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