The query-source option has the slight quirk of allowing the address to be specified in two ways, either as every other source option, or as an "address" key-value pair. For this reason, it had a separate parsing function from other X-source options, but it is possible to extend the parsing of other X-sources to be generic and also handle query-source. This commit just does that.