Resolve naming conflict
Use more elaborate signal handling strategy using new API to safely unregister handlers