cleanup of getopt use style; no real change