Clean up some llvm type construction