This is based on !5751 (merged)
Just a few relatively minor cleanups. See the commits. There's more in the over, but it'll be a tad bit more complicated, so let's flush the easy stuff first.
This already has the side effect of fixing cutout characters in the glyph cache.