Get rid of more uses of string and use const in a few places.