Adapt to addition of non-blocking pipe option