Fontdef cleanup

Mostly harmless, still would like a review before merging.