More fixes around ElementTree for Python 2.6