Code refactoring to prepare improvements to the font splitter.