Further cleanup of exceptions (#149).