C++ify things