Use scoped_restore in safe_parse_type This changes safe_parse_type to use scoped_restore rather than explicit assignments.