Testing changes to functions on SIGINT & SIGTERM

Seeing if this helps recover from node hangs on Trofa.