Cope with recent changes.