Gittrac #4209:  More fixes (right now the only error case I know of
is aborting with an exit code of 0); lots of diagnostic and temporary
code still in place; need to make sure new code is correct.