Queue termination

I think having both methods would be fine. BTW, @EpicWink, did you ever create that PR? I think you said there was an issue, but I don’t recall seeing a link to it. Maybe if you’re still distracted by real life, someone else could take over?