MAINT: further spread the usage of the CompoundToleranceModel