Improve Python 2.4 compatibility