Use state when you have it
Use state when you have it

... but either way works.

Change-Id: Ib66ee035229d0718b68450587550176c91ce9ca6
Related-Change-Id: Ic108f5c38f700ac4c7bcf8315bf4c55306951361

tipabu/swift,swiftstack/swift,matthewoliver/swift,tipabu/swift,openstack/swift,smerritt/swift,matthewoliver/swift,matthewoliver/swift,openstack/swift,matthewoliver/swift,swiftstack/swift,smerritt/swift,smerritt/swift,tipabu/swift,tipabu/swift,smerritt/swift,swiftstack/swift,openstack/swift,openstack/swift