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