Build fix following clang r199686