Allow returning from an exception
Optimise trap handling assembly slightly