Adjust when_any/some to the latest proposed interfaces