Fix ABI issue that manifests from another area of codegen.