Remove some uses of 'except C as e'