Miscellaneous cleanup

* Rename private categories conventionally
* Fix self return types
* Nix font factories
* Simplify font loading