Fix a gcc 4.4.7 issue and an LLVM 3.4 oversight.