Refactoring, no functionality change.