Don't use tuple parameters

Tuple parameters where removed from Py3K.

Partially-implements: py3k-support
Change-Id: Ibc57f5f3b25c240f48f5c1d9e54cd1d8e5972ea3