x86: more simplification for better performance
4 files changed