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