Tweak Python 2.5 support