Clean up signal handling a bit.

Again.