Move argument setup for call down to where it happens