Revamp mix of CLI and config file options so that their interactions either work or are more clear.