(BC-865B): Apply new conventions for glyph granularity.