x86: more simplification for better performance