Review and changes from Jocelyn Fiat

Yes.
I thought I guaranteed that this could never happen.
But anyway, introducing a nonce manager will solve this.