Clean up some piping code.
Fixes github issue #445