Accommodate refactoring elsewhere.