Second attempt at making Travis clang happy