Cleanup

Remove macros for Python <2.6
Remove more macros for ancient Python.