Converted to CPS, I think.
Removed sketchy code
Forgot to change one 'elim-closures' call to CPS-style
Fixed if-then test case.