Cleaned up same signal handling.