Fix bug introduced in GlyphNameInClass by me in 3cb817b, and simplify