Further increase Python2 compatibility.