ISR macros reorganized in order to be more flexible.