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