Some more tidying up of the exit handling
More cleanup of exit handling, also add a couple more noise classes to the list of things ignored.