Fix races in demo C++ bindings that can hang valgrind in CI