Minor code cleanup after refactoring.