Finish fix for issue 7715, after explicit search for calls to `arch`
2 files changed