more x86 reorg