I’m with you! I was also thinking about usability when I proposed “yes, and” above. Currently we have muscle memory around simply closing Bug topics when they are fixed. This also matches how we handle todos internally.
I like the idea of a one-click “fixed” button.