More edits to converge to the LLVM coding style