[collect_glyphs] handle ClassDef better
4 files changed