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