restore arbitrary arguments
Merge branch 'arbitrary-arguments-again'