[core] Minor cleanup of signal handling