Make Clang 3.4 work yet again