Conform to changes elsewhere.