more python 2.5 cleanups