But when did Iran become a signatory to the treat? As administrations (or even regimes) change, governmental priorities can change. But it's a lot harder and more aggravating to withdraw from a treaty than it is to not sign it in the first place. This is one reason why the US doesn't sign treaties willy nilly - no guarantee we'll want the landmine ban affecting us fifty years from now, for example.

Ultimately, we need a strategy for living with a nuclear armed Iran and not just containing it. Of course, that takes us well beyond the realm of "small" wars - except to the extent that Tehran chooses to use its influence to liven up neighboring conflicts. Are we seeing the beginning of a South West Asian Cold War?