Cope with API changes.