clean up the mess: move ISR definitions to a less wrong place