[X86] NFC: Clean up and clang-format a few lines