BF: Deal with python2.6 issues.

This might make our 2.6 bots finally happy.