Streamline parsing of query-source option

Right now the query-source and query-source-v6 options use a different parsing code path from other *-source options because of the extra flexibility of specifying the address in a key-value form. But the parser for other *-source options already allows some other parameters in key-value form, it should be possible to have a single code path for parsing all *-source options.