Fixing more merge conflicts.
Merge branch 'scope-rewrite' of github.com:brownplt/lambda-py into scope-rewrite