Made a few state verifications easier to read.