A few more improvements to get_exclude_tok() and add_exclude().