fixes roundtrip C++ bodies