Fixes for Python 2.6 string formatting.