Finished roscpp compatibility fix.