Merge "Revert "Refactor argument creation to be before the fork""