Explicitly pass the key parameters instead of using **kwargs.  Now we don't have to pop some stuff.
Merge pull request #641 from dreid/explicit-passing-of-key-parameters

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