33859: Fix traps in completion

We need to use a function-style trap in order for the effect of the
interrupt to propagate back correctly.