Rearrange interrupt handlers.