LLVM tidied up