Always specify parameters as tuples

Change-Id: I4b4769230e3c2e27a66be0d2dd2ae8ebd7b47862