Removed remaining dependencies on outdated sfYaml.