Some API changes and code to deal with LLVM IR control flow