Reorder states in setState

This should reflect the actual order in which these states should
always appear.