Move some macros to x86util.asm that should have been there to begin with.
Fix a typo that didn't cause any issues.