Last of the Python 2.6 string format fixes