Small refactoring, no functionality change.