Merge of the ARM EH work by David.

See issue #489.