Eliminate "except Failure:" special case

Neat.  It was not clear to me that these cases could be combined.