Experimenting with cleaning up the exception signatures.