Move some X86 subtarget configuration onto the subtarget that's being