Explicitly pass the key parameters instead of using **kwargs.

Now we don't have to pop some stuff.