(U-00023942): Apply new glyph-image conventions.