Adjust when_any/some to the latest proposed interfaces

A index? Wouldn't a iterator be more appropriate?