Small rewrite.

It's more logical to imply something about the next move using the
current move, rather than the other way around.
Added a TODO so we don't forget to do the gameState stuff.