Fix bug introduced in GlyphNameInClass by me in 3cb817b, and simplify
Merge pull request #1917 from rrthomas/master

Remove incorrect copy introduced in 3cb817b