C++ Style Opinions

#438255