Various Python 2.6 string format() fixes