More fixes to Python 2.6.