Minor refactoring of new Fmake_process code