Changed some calls using status-state order to state-status to be consistent and easier to read.