Doing a better job of dealing with the one player special case.