x86, numaq: cleanups