I think you should reuse the AccountMatcher trait, but if you are not able to reuse it, then for now, move these functions to ClosureExportSettings and delete this trait.

I can later try to use AccountMatcher.