As you're touching this code anyway, could you replace the ```Cancel(self)``` with ```return NextActivity```, please? You'd have to do the same thing a few lines further down for the limitedAmmo check.

That would then fix #4482.  Don't ask me why I didn't do that myself before, I literally just now grasped how to fix that when your PR made me look at that code again.