Improe command-line option handling.  Make everything inline esp. for
overhead reduction in update loop