Quickly bodge up better command-line options