Prevents arguments from leaking
Merge pull request #5400 from twokul/leaking-arguments

Prevents arguments from leaking