Default to command-line options over previously run options