Get rid of some Python 2.6 issues.