Fix a bogus merge. In bleeding, we'll show OpenCL warnings.