More work -- remove pre-throw/catch hacks