Refactor interrupt wrapper macros