X86: Tweaks to handling special NOPs.