C++ version
Summary: Minor changes on outputs
Test Plan: as you think fit
Reviewers: culpo
Differential Revision: https://c4science.ch/D138