Make indentation on errors reflect what we actually do, by not un-indenting until the next handler starts.
Code formatting now also builds a quick jump table for the handlers.