Good advice, and sounds like a trainer I was working with. He used leash control, a little snap, but warned me that I have to pick up on Ruger's signals early and make sure to stay ahead of him. I do this, but in this case I may be a little behind.
I wonder what would happen if I gave a treat, for Ruger, to the people he is calm with, but nothing for bad behavior.