Changes to internal handling of player state.