On this topic, I guess we would need to remove these from NFA trusts... or would we?
Good question.
I would think it could be made to apply retroactively. In that case, you should no longer need anything.
Of course, there is no telling. Congress can **** up a wet dream.