fix kwargs mapping in Py2.[45]