Minor cleanup of merge single successors
Disambiguate typenames in field access tree
Convert throws to gotos where possible