stx     IRQInd+2
        lda     #<IRQStub
        ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
-       rts
+       jmp     setvec
 
 ; ------------------------------------------------------------------------
 
 doneirq:
        lda     IRQInd+1
        ldx     IRQInd+2
-       sei
+setvec:        sei
        sta     IRQVec
        stx     IRQVec+1
        cli
 
        stx     IRQInd+2
        lda     #<IRQStub
        ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
-       rts
+       jmp     setvec
 
 ; ------------------------------------------------------------------------
 
 doneirq:
        lda     IRQInd+1
        ldx     IRQInd+2
-       sei
+setvec:        sei
        sta     IRQVec
        stx     IRQVec+1
        cli
 
        stx     IRQInd+2
        lda     #<IRQStub
        ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
-       rts
+       jmp     setvec
 
 ; ------------------------------------------------------------------------
 
 doneirq:
        lda     IRQInd+1
        ldx     IRQInd+2
-       sei
+setvec:        sei
        sta     IRQVec
        stx     IRQVec+1
        cli
 
        stx     IRQInd+2
        lda     #<IRQStub
        ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
-       rts
+       jmp     setvec
 
 ; ------------------------------------------------------------------------
 
 doneirq:
        lda     IRQInd+1
        ldx     IRQInd+2
-       sei
+setvec:        sei
        sta     IRQVec
        stx     IRQVec+1
        cli
 
        stx     IRQInd+2
        lda     #<IRQStub
        ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
-       rts
+       jmp     setvec
 
 ; ------------------------------------------------------------------------
 
 doneirq:
        lda     IRQInd+1
        ldx     IRQInd+2
-       sei
+setvec:        sei
        sta     IRQVec
        stx     IRQVec+1
        cli
 
        stx     IRQInd+2
        lda     #<IRQStub
        ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
-       rts
+       jmp     setvec
 
 ; ------------------------------------------------------------------------
 
 doneirq:
        lda     IRQInd+1
        ldx     IRQInd+2
-       sei
+setvec:        sei
        sta     IRQVec
        stx     IRQVec+1
        cli