Update to compile with Clang r218071.