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