C++: Small cleanup. This has no effect on semantics.