(GT-K01444): Modify for new glyph-image conventions.