BF: Python 2.6 fixes.