More fixes related to removal of exception slicing.