Minimal attempt to obey Google C++ Coding Style a bit more.