Fix previously broken x86_64 check, simplifying it in the process.