Cleanup of font modifier code.