Much of the code is now building in C++, and I'm using C++23. A spot test seems to work. Now I can start to debride all the painful memory management quirks...