GCC 4.7.4 compatibility

This pull request eleminates the last few GCC 4.7 traps and allows us to move to it. Needs functional testing on bench and flight.