Merge "Clean up init signal handling a little."