For any player this is unsure about whether they should accept the assignment or choose free agency, a team can just say "look, elect FA and sign back with us and you may be back up sooner".
The player already has the right to choose FA so it doesn't expose them to other teams any more than they were already exposed.
Basically, the rules should say that if a player elects FA and signs back with same team then the waiting period still applies.