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