Fix mismatching C++ new[] / delete calls