Updates to run under Python 2.6.