x86, numaq_32: clean up, misc