[PATCH] x86: more asm cleanups