More cleanup in the C++ shell
Cleanup for auto-returntype
Progress reporting for writes too