ENH: fix std::string usage