Add new superclass SDefOrExp
Merge master
Merge branch 'master' into defOrExp
Fix type errors
Merge branch 'master' into defOrExp
Merge master
Merge master
Merge branch 'master' into defOrExp
Modify class hierarchy slightly
Fix indentation
Make CPS translation and closure conversion work with new classes