Refactored pipeline to make room for simple directives.