Improvements to new IntermediateExpansion execution flows