Minor rework, work towards using StateT Game IO ()