commit: Merge an old patch of Ben's, involving font instantiation and charsets.