diff --git a/c++/BUILD.bazel b/c++/bak.BUILD.bazel
similarity index 100%
rename from c++/BUILD.bazel
rename to c++/bak.BUILD.bazel
diff --git a/c++/src/capnp/BUILD.bazel b/c++/src/capnp/bak.BUILD.bazel
similarity index 100%
rename from c++/src/capnp/BUILD.bazel
rename to c++/src/capnp/bak.BUILD.bazel
diff --git a/c++/src/capnp/compat/BUILD.bazel b/c++/src/capnp/compat/bak.BUILD.bazel
similarity index 100%
rename from c++/src/capnp/compat/BUILD.bazel
rename to c++/src/capnp/compat/bak.BUILD.bazel
diff --git a/c++/src/kj/BUILD.bazel b/c++/src/kj/bak.BUILD.bazel
similarity index 100%
rename from c++/src/kj/BUILD.bazel
rename to c++/src/kj/bak.BUILD.bazel
diff --git a/c++/src/kj/string.h b/c++/src/kj/string.h
index 100c7deda5..2cfa51814b 100644
--- a/c++/src/kj/string.h
+++ b/c++/src/kj/string.h
@@ -95,9 +95,7 @@ class StringPtr {
   inline StringPtr(const char8_t* begin KJ_LIFETIMEBOUND, const char8_t* end KJ_LIFETIMEBOUND)
       : StringPtr(reinterpret_cast<const char*>(begin), reinterpret_cast<const char*>(end)) {}
   // KJ strings are and always have been UTF-8, so screw this C++20 char8_t stuff.
-#endif
-
-#if __cplusplus >= 202000L
+#elif __cplusplus >= 202000L
   inline StringPtr(const char8_t* value): StringPtr(reinterpret_cast<const char*>(value)) {}
   inline StringPtr(const char8_t* value, size_t size)
       : StringPtr(reinterpret_cast<const char*>(value), size) {}