[4.0] FontClient - Minor refactoring.