De-kludge and strength-reduce scavenge_interrupt_context()