Improved argument passing.