x86, pat: cleanups