Separate Python 2.4 related workarounds