Prospective build fix following clang r210518