x86, cpu: Clean up and unify the NOP selection infrastructure