More GCC 4.x code cleanup
5 files changed