Merged in refactoring.