Use the new x86 setup code for x86-64; unify with i386