Turn some of them back into bare except:s, for ones that maybe should be.

Particularly in tests.