Update for move of string conversion functions into base::