Revert some when_each/wait_each fixes, back to the old wait as they do need the index