Minor changes developed by mppf designed to get the LLVM build working again
Merge pull request #132 from noakesmichael/llvm

One or more of the changes over the last month or so have broken the LLVM build. This is a commit of a subset of the fixes that Michael developed to address this. These changes have been verified for STD.
The next step is to understand the status of LLVM using paratest

Compiled: STD clang, LLVM clang, and STD gnu.
Tested: paratest --verify