Small changes to produce more effective execution plans

* Collapses ExtractPipes into a single instance
* Does not produce FilterPipes when not needed