Merge except/raise into the core.
Remove some redundant stuff.