For example, if poll accepted **kwargs*, this change wouldn't be required.

* Or, if that parameter defaulted to None and the poll method assigned a new dict() to it when it was None. Again, I'm not totally familiar with the CLI, so my knowledge in this codebase is weak.