A stringstream is overkill here
Fix return value of CVS::toString() + cosmetics

CVS::toString() returns a docstring, so rather be explicit than relying on a
cast that not everybody understands how it works at first sight.
Remove heavy includes
Avoid implicit copy