x86/amd-iommu: Remove some merge helper code