notmuch-emacs-mua: move --client option handling around