Fix partial refactoring.