Adjust when_any/some to the latest proposed interfaces

Iterator wouldn't work for the `tuple` case.