x86: change x86_64 sanity checks to match i386.