Add another EH test dealing with handler selection
Support re-raise
Simplify Try a bit