Cleaner handling of interrupts.