Merge "Fix mac build; add closures.c for python3"