Need to commit these, too, for the font rendering change.