[#2222] Clean up signal handler registration