Remove more references to safe_yaml.