More incomplete work for Flow/Extruder refactoring