CAC-2 Some housekeeping to reduce warnings given by contracts.