Fixed compiler errors, still working on getting the simple CPS case working.