Glyph simplifications and misc cleanup