fixing if statements after coffee-style object definitions

closes gh-72
fixing multiple return values in wait fors