Yes to all three. Additionally, not avoiding any words, sounds or situations even if I did feel fear. And actively pushing out of my comfort zones by doing things that I wouldn't normally do, and quiet frankly what even fluent speakers would be apprehensive about- presentations, public speaking, speaking to random people on the streets, radio interview, etc. I would summarise my recent stammering treatment as physical + psychological techniques => using these as much as possible in real world situations. It definitely wasn't straightforward, but if it doesn't challenge you it doesn't change you.