Swap return value order in pipes::oneshot Issue #4496