Add a better "both" option for streams and targets.