Fix EvFOutputModule
Avoid double-insertion-of-parameters error
Fix file name in import statement
Fix of fix
Merge pull request #4413 from Martin-Grunewald/MoreCfiFileFixes

More cfi file fixes (auto-port to 72X as well)