Removed more std::strings.