Clean up a little more interrupted-thread stuff (#478)