Hi,

hmm, I'll let Mark comment on the possibility of merging the two
configuration-file selectors--but the patch looks good to me regardless.