Only set options from command-line if they were explicitely specified