Fixes for ugly style used in my early C++ days