Yes, both of these scenarios are what we hope, especially the latter since I don't envision the USPTO to just stop software patents without such catalyst. But

Yes, both of these scenarios are what we hope, especially the latter since I don't envision the USPTO to just stop software patents without such catalyst. But as you know, obtaining patents to open to public domain isn't the norm. I would guess that change of leadership (or even change of heart of the leader) to ones who don't believe in the original defensive intent of the patent happens more frequently.