Simplify state transitions.

State transitions can be simplified with the knowledge that any
transition to a TakingCalls state is the start of a new round and that
any transition to a WaitingForPlayers requires a game reset.