C++ correctness

And one whitespace change that missed that commit.