More refactoring glyph class access
3 files changed