Continued isolating x86_64-specific code from x86-specific code.