Improve cpp converter.