x86: Tidy up a few minor issues with interrupts