Changes required to compile cleanly in Python.
Minimal changes required to link.