More cleanup on the game interface.