Here's a series that removes a few more cleanups. It's a mixed bag of string-based cleanups and scoped_restore-like cleanups. Regression tested on the buildbot. Tom