Moved the %-name preserving code into the regular xattr patch.