I think you need to add comparable code in `brand_next_thread` for interrupt threads as well.

Again with the spacing oddity.