Prevent accidental leakage of arguments between separate calls

Prevent accidental leakage of arguments between separate calls #1518