More py2.6 compatibility.