(temp-commit) use std::string more heavily