Python 2.6 compatibility; missed a few set literals in tests.