removing "Use Carp" and "sub die_with_dignity" that I was supposed to remove from the previous patch before checking it in.