Done here and in a couple of other places (now `exit` is actually being used!)