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