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