x86: drop a few dead macros