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