First wave of pipeline refactoring. Executor is no longer the driven force.