MAINT: more CompoundToleranceModel usage