Some dopipe cleanup now that invoke is gone.
More shell cleanup.