Adjust when_some to follow the latest proposed when_any