Stdstring removal part2

Round two of @notspiff's stdstring removal.

Would be good to get this in this round so I can clean up the next one.