Add death notify coverage. Minor code cleanup.