Combine the x86/x86-64 and stub type selection branches, since the same code works for either of them.