Start to clean up duplicated code in glyph classes.