Removed unnecessary std::string calls.