Merge branch 'x86/cleanups' into x86/trampoline