Converted a couple more C arrays to std::vector in wrappers.cpp.