Conform to other changes.