Clean up of mp::connect/wait gotos in play_game().
Update mp::connect tests.