Accommodate CAL changes.