More Python 2.4 compatibility.