Update to build against clang-3.5