refactoring of lib/polyfill-scan/matchers