Expand plan refactoring

projectedDir is added to the signature of OptionalExpand but never used by the pipe?