Get rid of a few old C++ variables.