WIP: Moving if/for/let etc out of calls.clj, and commenting out until it all compiles :)