fix comment (#7907)
Fix a problem caused by very large objects (#7919)

As far as I can tell the bug should be harmless, apart from the
failing assertion.  Since the ticket reported crashes, there might be
problems elsewhere that aren't triggered by this test case.
Handle -opt<blah> options more consistently (#7909)

Now these are always added by the run<blah> functions in SysTools, so
we never miss any out.  Several cleanups resulted.