Fix another missing code refactoring.