Initial code shuffle collapse blocks and fix for LLVM

1) An initial cleanup in preparation for refactoring collapseBlocks to support the new Loop AST nodes.

2) Also a fix to LLVM to conform to the new signature for buildVarDecls.