MAINT: more CompoundToleranceModel code conversion