scorpion: Don't use separate state to calculate score and win condition.

For bug 677197.