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