Composition of exception handlers

Also some line length tidyups, and commenting out of macros