Move parameters around for python 2 compatibility.