Merge "ParseFloat/ParseDouble, also take std::string"