Adjust to recent changes in base.