Remove uses of to_deprecated_string