Changes suggested by Effective C++ (F.Carminati)