Changes to reflect refactoring in other libraries.