Some additional sprintf and std::string cleanup