New attempt at compiling with clang++-3.5