Switch state machine transitions to increment

Rather than explicitly setting the next state just increment
the current state - makes it easier to add extra states.