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