Some code cleanup for GCC 4.x
24 files changed