More rudimentary python 2.5 support