Working on C->C++
Same.