My guess is it will be modified to make all years on contracts past 35+ guaranteed cap hits, regardless of when the contract is signed (old contracts signed grandfathered in). That doesn't help the Salvador contract. That system might make for screwy situations where teams strongly pressure overpaid players to retire before hitting 35 though which could be awkward.