Merge "Clean up the arg setup for exec(3)."