Simplify and unify termination behaviour of pipe, tee, wye