Replace a couple more cases of splnet/splx with irqsave/irqrestore