Refactor x86_128 intermixing