Finish gcc 4.2 changes.