Clean up signal handling a bit.

Change to sig to be consistent.