emacs: Tidy up C++ initialization.