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