Clean up signal handling a bit.

Okay.